From 6a894e8c38857f24f118f9ee37448625af199aa2 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 26 Apr 2023 10:23:32 +0200 Subject: [PATCH 1/2] Move update-versions.sh script Signed-off-by: Marco Franssen --- .github/{workflows => }/scripts/update-versions.sh | 2 +- .github/workflows/check-versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename .github/{workflows => }/scripts/update-versions.sh (94%) diff --git a/.github/workflows/scripts/update-versions.sh b/.github/scripts/update-versions.sh similarity index 94% rename from .github/workflows/scripts/update-versions.sh rename to .github/scripts/update-versions.sh index b2be7d4..bf34574 100755 --- a/.github/workflows/scripts/update-versions.sh +++ b/.github/scripts/update-versions.sh @@ -3,7 +3,7 @@ SCRIPT="$(readlink -f "$0")" SCRIPTPATH="$(dirname "${SCRIPT}")" -CHARTJSON="${SCRIPTPATH}/../../tests/charts.json" +CHARTJSON="${SCRIPTPATH}/../tests/charts.json" jq -r ".[].name" "${CHARTJSON}" | while read -r CHART; do ENTRYQUERY='.[] | select(.name == "'$CHART'")' diff --git a/.github/workflows/check-versions.yaml b/.github/workflows/check-versions.yaml index 85cd437..eee248e 100644 --- a/.github/workflows/check-versions.yaml +++ b/.github/workflows/check-versions.yaml @@ -29,7 +29,7 @@ jobs: - name: Update test chart versions run: | - ./.github/workflows/scripts/update-versions.sh + ./.github/scripts/update-versions.sh git diff - name: Create Pull Request From 3889d22e3473696d0585c6a70f2b8eb456eb66fc Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 26 Apr 2023 10:29:52 +0200 Subject: [PATCH 2/2] Fix quotation bug in update-version.sh Signed-off-by: Marco Franssen --- .github/scripts/update-versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/update-versions.sh b/.github/scripts/update-versions.sh index bf34574..2be760e 100755 --- a/.github/scripts/update-versions.sh +++ b/.github/scripts/update-versions.sh @@ -18,7 +18,7 @@ jq -r ".[].name" "${CHARTJSON}" | while read -r CHART; do echo " latest version: ${LATEST_VERSION}" if [ "x${VERSION}" != "x${LATEST_VERSION}" ]; then echo " New version found!" - jq "(${ENTRYQUERY}).version |= "'"${LATEST_VERSION}"' "${CHARTJSON}" > /tmp/$$ + jq "(${ENTRYQUERY}).version |= \"${LATEST_VERSION}\"" "${CHARTJSON}" > /tmp/$$ mv /tmp/$$ "${CHARTJSON}" fi done