Use strenv for setting values from env in yq

ssl-hep · Nov 17, 2022 · c915c6b · c915c6b
1 parent 29a7d6d
commit c915c6b
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci_helm_publish.yaml b/.github/workflows/ci_helm_publish.yaml
@@ -45,17 +45,17 @@ jobs:
         uses: mikefarah/yq@master
         with:
           cmd: |
-            yq -i '.spec.chart.spec.version = "'$RELEASE_VERSION'" | .spec.chart.spec.version style="double" ' flux_river_configs/servicex-int-uproot/values.yaml &&
-            yq -i '.spec.chart.spec.version = "'$RELEASE_VERSION'" | .spec.chart.spec.version style="double" ' flux_river_configs/servicex-int-xaod/values.yaml &&
-            yq -i '.appVersion = "'$RELEASE_VERSION'" | .appVersion style="double" | .version = "'$RELEASE_VERSION'"| .version style="double" ' helm/servicex/Chart.yaml &&
-            yq -i '.app.tag = "'$DOCKER_TAG'" | .app.tag style="double" |
-            .didFinder.rucio.tag = "'$DOCKER_TAG'" | .didFinder.rucio.tag style="double" |
-            .didFinder.CERNOpenData.tag = "'$DOCKER_TAG'" | .didFinder.CERNOpenData.tag style="double" |
-            .transformer.sidecarTag.tag = "'$DOCKER_TAG'" | .transformer.sidecarTag.tag style="double" |
-            .transformer.defaultScienceContainerTag.tag = "'$DOCKER_TAG'" | .transformer.defaultScienceContainerTag.tag style="double" |
-            .transformer.defaultTransformerTag = "'$DOCKER_TAG'" | .transformer.defaultTransformerTag style="double" |
-            .x509Secrets.tag = "'$DOCKER_TAG'" | .x509Secrets.tag style="double" |
-            .codeGen.tag = "'$DOCKER_TAG'" | .codeGen.tag style="double" ' helm/servicex/values.yaml
+            yq -i '.spec.chart.spec.version = strenv(RELEASE_VERSION) | .spec.chart.spec.version style="double" ' flux_river_configs/servicex-int-uproot/values.yaml &&
+            yq -i '.spec.chart.spec.version = strenv(RELEASE_VERSION) | .spec.chart.spec.version style="double" ' flux_river_configs/servicex-int-xaod/values.yaml &&
+            yq -i '.appVersion = strenv(RELEASE_VERSION) | .appVersion style="double" | .version = "'$RELEASE_VERSION'"| .version style="double" ' helm/servicex/Chart.yaml &&
+            yq -i '.app.tag = strenv(DOCKER_TAG) | .app.tag style="double" |
+            .didFinder.rucio.tag = strenv(DOCKER_TAG) | .didFinder.rucio.tag style="double" |
+            .didFinder.CERNOpenData.tag = strenv(DOCKER_TAG) | .didFinder.CERNOpenData.tag style="double" |
+            .transformer.sidecarTag.tag = strenv(DOCKER_TAG) | .transformer.sidecarTag.tag style="double" |
+            .transformer.defaultScienceContainerTag.tag = strenv(DOCKER_TAG) | .transformer.defaultScienceContainerTag.tag style="double" |
+            .transformer.defaultTransformerTag = strenv(DOCKER_TAG) | .transformer.defaultTransformerTag style="double" |
+            .x509Secrets.tag = strenv(DOCKER_TAG) | .x509Secrets.tag style="double" |
+            .codeGen.tag = strenv(DOCKER_TAG) | .codeGen.tag style="double" ' helm/servicex/values.yaml
       - name: Create helm package
         working-directory: ./helm
         run: |