[fix] Fix variable interpolation in the workflows (#1277)

Fix variable interpolation in CD and release workflows Signed-off-by: Ivan Polchenko <[email protected]>
bcgov · Jul 24, 2024 · 0460774 · 0460774
1 parent c68a56b
commit 0460774
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/chart_release.yaml b/.github/workflows/chart_release.yaml
@@ -81,19 +81,19 @@ jobs:
           CHART_VERSION: ${{ steps.chart_version.outputs.CHART_VERSION }}
         run: |
           cd trust-over-ip-configurations
-          yq e -i '.appVersion = $APP_VERSION' services/traction/charts/test/Chart.yaml
-          yq e -i '.version = $CHART_VERSION' services/traction/charts/test/Chart.yaml
-          yq e -i '.dependencies[0].version = $CHART_VERSION' services/traction/charts/test/Chart.yaml
+          yq e -i '.appVersion = env(APP_VERSION)' services/traction/charts/test/Chart.yaml
+          yq e -i '.version = env(CHART_VERSION)' services/traction/charts/test/Chart.yaml
+          yq e -i '.dependencies[0].version = env(CHART_VERSION)' services/traction/charts/test/Chart.yaml
 
       - name: Update prod
         env:
           APP_VERSION: ${{ steps.chart_version.outputs.APP_VERSION }}
           CHART_VERSION: ${{ steps.chart_version.outputs.CHART_VERSION }}
         run: |
           cd trust-over-ip-configurations
-          yq e -i '.appVersion = $APP_VERSION' services/traction/charts/prod/Chart.yaml
-          yq e -i '.version = $CHART_VERSION' services/traction/charts/prod/Chart.yaml
-          yq e -i '.dependencies[0].version = $CHART_VERSION' services/traction/charts/prod/Chart.yaml
+          yq e -i '.appVersion = env(APP_VERSION)' services/traction/charts/prod/Chart.yaml
+          yq e -i '.version = env(CHART_VERSION)' services/traction/charts/prod/Chart.yaml
+          yq e -i '.dependencies[0].version = env(CHART_VERSION)' services/traction/charts/prod/Chart.yaml
 
       - name: Commit and Push to trust-over-ip-configurations Repo
         run: |

diff --git a/.github/workflows/on_push_main.yaml b/.github/workflows/on_push_main.yaml
@@ -131,12 +131,12 @@ jobs:
             CHART_VERSION="${{ steps.chart_version.outputs.PUBLISHED_CHART_VERSION }}"
           fi
 
-          yq e -i '.appVersion = $APP_VERSION' services/traction/charts/dev/Chart.yaml
-          yq e -i '.version = $CHART_VERSION' services/traction/charts/dev/Chart.yaml
-          yq e -i '.dependencies[0].version = $CHART_VERSION' services/traction/charts/dev/Chart.yaml
-          yq e -i '.traction.acapy.image.tag = $IMAGE_TAG' services/traction/charts/dev/values.yaml
-          yq e -i '.traction.tenant_proxy.image.tag = $IMAGE_TAG' services/traction/charts/dev/values.yaml
-          yq e -i '.traction.ui.image.tag = $IMAGE_TAG' services/traction/charts/dev/values.yaml
+          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
+          yq e -i '.dependencies[0].version = env(CHART_VERSION)' services/traction/charts/dev/Chart.yaml
+          yq e -i '.traction.acapy.image.tag = env(IMAGE_TAG)' services/traction/charts/dev/values.yaml
+          yq e -i '.traction.tenant_proxy.image.tag = env(IMAGE_TAG)' services/traction/charts/dev/values.yaml
+          yq e -i '.traction.ui.image.tag = env(IMAGE_TAG)' services/traction/charts/dev/values.yaml
 
       - name: Commit and Push to trust-over-ip-configurations Repo
         run: |