Merge pull request #1516 from thehyve/devops/FAIRSPC-23_deployment

fixed workflow input for helm jobs
thehyve · Apr 3, 2024 · 81d13a9 · 81d13a9
2 parents 0db166c + bcd0f0c
commit 81d13a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/deploy_helm_chart.yaml b/.github/workflows/deploy_helm_chart.yaml
@@ -3,12 +3,11 @@ name: Deploy Helm Chart to FNS GKE
 on:
   workflow_dispatch:
     inputs:
-      name:
-        description: "Manual trigger for Helm chart deploy"
       version:
-        description: "Version of the Helm chart to deploy (optional, defaults to latest  snapshot)"
+        description: "Version of the Helm chart to deploy (optional, defaults to latest snapshot)"
         required: false
-      environment:
+      env:
+        type: choice
         description: "Environment to deploy to"
         required: true
         default: "test"
@@ -46,7 +45,7 @@ jobs:
 
       - name: Define Helm Chart version (taken from input or latest snapshot)
         run: |
-          VERSION=$(cat ./VERSION)
+          VERSION=$(cat ./VERSION)-SNAPSHOT
           if [ -n "${{ github.event.inputs.version }}" ]; then
             VERSION=${{ github.event.inputs.version }}
           fi

diff --git a/.github/workflows/package_and_push_helm_chart.yaml b/.github/workflows/package_and_push_helm_chart.yaml
@@ -7,8 +7,6 @@ on:
       - release
   workflow_dispatch:
     inputs:
-      name:
-        description: "Manual trigger for Helm chart packaging and pushing"
       version:
         description: "Version of the Helm chart to push"
         required: false