From 30a98697e42069c5faa2f115464226f6575b456b Mon Sep 17 00:00:00 2001 From: Hank Donnay Date: Wed, 5 Apr 2023 09:16:28 -0500 Subject: [PATCH] cicd: update go versions Claircore now requires 1.20, so update all the CI chores to use it. Signed-off-by: Hank Donnay --- .github/script/nightly-module.sh | 2 +- .github/workflows/config-ci.yml | 2 +- .github/workflows/cut-release.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/nightly.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/script/nightly-module.sh b/.github/script/nightly-module.sh index f2372b8a09..dea240e3b8 100755 --- a/.github/script/nightly-module.sh +++ b/.github/script/nightly-module.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e : ${CLAIRCORE_BRANCH:=main} -: ${GO_VERSION:=1.18} +: ${GO_VERSION:=1.20} test "${#GO_VERSION}" -gt 4 && GO_VERSION=${GO_VERSION%.*} cd $(git rev-parse --show-toplevel) diff --git a/.github/workflows/config-ci.yml b/.github/workflows/config-ci.yml index 45a0510a8b..530edc5be6 100644 --- a/.github/workflows/config-ci.yml +++ b/.github/workflows/config-ci.yml @@ -23,7 +23,7 @@ jobs: steps: - id: config run: | - echo 'go_versions=["1.18", "1.19"]' >> "$GITHUB_OUTPUT" + echo 'go_versions=["1.20", "1.19"]' >> "$GITHUB_OUTPUT" commit-check: name: Commit Check diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml index e1ebaf0bbb..568edc1457 100644 --- a/.github/workflows/cut-release.yml +++ b/.github/workflows/cut-release.yml @@ -13,7 +13,7 @@ jobs: runs-on: 'ubuntu-latest' strategy: matrix: - image: ['quay.io/projectquay/golang:1.18'] + image: ['quay.io/projectquay/golang:1.20'] container: image: ${{ matrix.image }} outputs: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a09c911df..2914fc648f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: steps: - id: config run: | - echo 'go_versions=["1.18", "1.19", "1.20"]' >> "$GITHUB_OUTPUT" + echo 'go_versions=["1.20","1.19"]' >> "$GITHUB_OUTPUT" commit-check: name: Commit Check diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 486ed205f5..db9b58d818 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -30,7 +30,7 @@ jobs: # nicer workflow inputs so that the cron trigger works. run: | br=$(test -n "${{github.event.inputs.branch}}" && echo "${{github.event.inputs.branch}}" || echo main) - gv=$(test -n "${{github.event.inputs.go_version}}" && echo "${{github.event.inputs.go_version}}" || echo 1.18) + gv=$(test -n "${{github.event.inputs.go_version}}" && echo "${{github.event.inputs.go_version}}" || echo 1.20) : "${repo:=$GITHUB_REPOSITORY}" test "${repo%%/*}" = quay && repo="projectquay/${repo##*/}" ||: cat <<. >>$GITHUB_OUTPUT