From 5fbec5bd850bde30187d8d9e041dd65ee3f7703d Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 6 Feb 2024 09:54:20 -0500 Subject: [PATCH] Specify the yq eval command for compat with older versions The eval command was not always the default in yq. Change-type: patch Signed-off-by: Kyle Harding --- .github/workflows/flowzone.yml | 6 +++--- flowzone.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index f999f865c..6e6363089 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -1919,15 +1919,15 @@ jobs: if [ ! -f .env ] then - yq '.services.*.env_file |= map(with(select(. == ".env") ; . = "${{ env.COMPOSE_ENV_FILE }}"))' -i "${file}" + yq e '.services.*.env_file |= map(with(select(. == ".env") ; . = "${{ env.COMPOSE_ENV_FILE }}"))' -i "${file}" fi done touch ${COMPOSE_ENV_FILE} docker compose --env-file="${COMPOSE_ENV_FILE}" --project-directory="$(pwd)" ${args} config > "${COMPOSE_FILE}" - yq '(.services.* | select(.build != null)).platform |= "${{ matrix.platform }}"' -i "${COMPOSE_FILE}" - yq . "${COMPOSE_FILE}" + yq e '(.services.* | select(.build != null)).platform |= "${{ matrix.platform }}"' -i "${COMPOSE_FILE}" + yq e . "${COMPOSE_FILE}" - name: Generate docker metadata id: test_meta uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 diff --git a/flowzone.yml b/flowzone.yml index 304c29041..d4561463e 100644 --- a/flowzone.yml +++ b/flowzone.yml @@ -2162,15 +2162,15 @@ jobs: if [ ! -f .env ] then - yq '.services.*.env_file |= map(with(select(. == ".env") ; . = "${{ env.COMPOSE_ENV_FILE }}"))' -i "${file}" + yq e '.services.*.env_file |= map(with(select(. == ".env") ; . = "${{ env.COMPOSE_ENV_FILE }}"))' -i "${file}" fi done touch ${COMPOSE_ENV_FILE} docker compose --env-file="${COMPOSE_ENV_FILE}" --project-directory="$(pwd)" ${args} config > "${COMPOSE_FILE}" - yq '(.services.* | select(.build != null)).platform |= "${{ matrix.platform }}"' -i "${COMPOSE_FILE}" - yq . "${COMPOSE_FILE}" + yq e '(.services.* | select(.build != null)).platform |= "${{ matrix.platform }}"' -i "${COMPOSE_FILE}" + yq e . "${COMPOSE_FILE}" - *dockerTestMetadata - *dockerCacheFromMetadata