From e3db1c174e8f383d5e6884c9183faa4eca6ce19f Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 10 Mar 2021 10:49:16 +0100 Subject: [PATCH 1/2] scripts: fail if version generator cannot retrieve currently used version --- scripts/generate-versions.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/generate-versions.sh b/scripts/generate-versions.sh index 3eb01bae..5ae8d30b 100755 --- a/scripts/generate-versions.sh +++ b/scripts/generate-versions.sh @@ -11,7 +11,12 @@ get_latest_version() { # Get component version from version file get_current_version() { echo >&2 "Reading currently used version of ${1}" - jq -r ".${1}" "$VERSION_FILE" + v=$(jq -r ".${1}" "$VERSION_FILE") + if [ "${v}" == "" ]; then + echo >&2 "Couldn't read version of ${1} from $VERSION_FILE" + exit 1 + fi + echo "$v" } # Get version from online source and filter out unstable releases. In case of unstable release use what is set in version file From 8834c2d5e0119e584388ce53218fd059a889a71a Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 10 Mar 2021 10:58:52 +0100 Subject: [PATCH 2/2] .github: disable version updater Signed-off-by: paulfantom --- .github/workflows/versions.yaml | 19 ------------------- scripts/generate-versions.sh | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 .github/workflows/versions.yaml diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml deleted file mode 100644 index d3fd816b..00000000 --- a/.github/workflows/versions.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Sync component versions - -on: - schedule: - - cron: '18 8 * * *' - -jobs: - versions: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - persist-credentials: false - - uses: actions/setup-go@v2 - - uses: romoh/dependencies-autoupdate@v1.1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - update-command: "'scripts/generate-versions.sh $token > jsonnet/kube-prometheus/versions.json'" - on-changes-command: "'make --always-make generate'" diff --git a/scripts/generate-versions.sh b/scripts/generate-versions.sh index 5ae8d30b..2daa38bb 100755 --- a/scripts/generate-versions.sh +++ b/scripts/generate-versions.sh @@ -37,7 +37,7 @@ convert_to_camel_case() { } # File is used to read current versions -VERSION_FILE="jsonnet/kube-prometheus/versions.json" +VERSION_FILE="$(pwd)/jsonnet/kube-prometheus/versions.json" # token can be passed as `GITHUB_TOKEN` variable or passed as first argument GITHUB_TOKEN=${GITHUB_TOKEN:-${1}}