fix env setting

Signed-off-by: Ivan Polchenko <[email protected]>
bcgov · Jul 24, 2024 · 78b9aaf · 78b9aaf
1 parent 094e2ee
commit 78b9aaf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/chart_release.yaml b/.github/workflows/chart_release.yaml
@@ -72,8 +72,8 @@ jobs:
         run: |
           helm repo add traction https://bcgov.github.io/traction
           helm repo update
-          echo "::set output name=APP_VERSION::$(helm search repo traction -ojson | jq '.[0].app_version')"
-          echo "::set output name=CHART_VERSION::$(helm search repo traction -ojson | jq '.[0].version')"
+          echo "APP_VERSION=$(helm search repo traction -ojson | jq '.[0].app_version')" >> $GITHUB_OUTPUT
+          echo "CHART_VERSION=$(helm search repo traction -ojson | jq '.[0].version')" >> $GITHUB_OUTPUT
 
       - name: Update test
         env:

diff --git a/.github/workflows/on_push_main.yaml b/.github/workflows/on_push_main.yaml
@@ -113,23 +113,22 @@ jobs:
         run: |
           helm repo add traction https://bcgov.github.io/traction
           helm repo update
-          echo "PUBLISHED_APP_VERSION=$(helm search repo traction -ojson | jq -r '.[0].app_version')" >> $GITHUB_OUTPUT
-          echo "PUBLISHED_CHART_VERSION=$(helm search repo traction -ojson | jq -r '.[0].version')" >> $GITHUB_OUTPUT
-          echo "LOCAL_APP_VERSION=$(yq e .appVersion charts/traction/Chart.yaml)" >> $GITHUB_OUTPUT
-          echo "LOCAL_CHART_VERSION=$(yq e .version charts/traction/Chart.yaml)" >> $GITHUB_OUTPUT
+
+          if [[ "${{ needs.check_helm_changes.outputs.helm_changed }}" == "true" ]]; then
+            echo "APP_VERSION=$(yq e .appVersion charts/traction/Chart.yaml)" >> $GITHUB_OUTPUT
+            echo "CHART_VERSION=$(yq e .version charts/traction/Chart.yaml)" >> $GITHUB_OUTPUT
+          else
+            echo "APP_VERSION=$(helm search repo traction -ojson | jq '.[0].app_version')" >> $GITHUB_OUTPUT
+            echo "CHART_VERSION=$(helm search repo traction -ojson | jq '.[0].version')" >> $GITHUB_OUTPUT
+          fi
 
       - name: Update versions
         env:
+          APP_VERSION: ${{ steps.chart_version.outputs.APP_VERSION }}
+          CHART_VERSION: ${{ steps.chart_version.outputs.CHART_VERSION }}
           IMAGE_TAG: ${{ needs.build_acapy.outputs.image_version }}
         run: |
           cd trust-over-ip-configurations
-          if [[ "${{ needs.check_helm_changes.outputs.helm_changed }}" == "true" ]]; then
-            APP_VERSION="${{ steps.chart_version.outputs.LOCAL_APP_VERSION }}"
-            CHART_VERSION="${{ steps.chart_version.outputs.LOCAL_CHART_VERSION }}"
-          else
-            APP_VERSION="${{ steps.chart_version.outputs.PUBLISHED_APP_VERSION }}"
-            CHART_VERSION="${{ steps.chart_version.outputs.PUBLISHED_CHART_VERSION }}"
-          fi
 
           yq e -i '.appVersion = env(APP_VERSION)' services/traction/charts/dev/Chart.yaml
           yq e -i '.version = env(CHART_VERSION)' services/traction/charts/dev/Chart.yaml