From 538eb9ca7f52f73cfa17c69a44eaad368ecd94c5 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Fri, 28 Jul 2023 11:11:50 +0100 Subject: [PATCH] deps: upgrade to go1.20.6 for release builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also make the previous go version supported in the trybot build matrix a field defined in the repo package. Signed-off-by: Paul Jolly Change-Id: I0c4348fba288cb1d6b2f606c006c602b2604c9f3 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/557009 Reviewed-by: Daniel Martí TryBot-Result: CUEcueckoo --- .github/workflows/release.yml | 2 +- internal/ci/github/trybot.cue | 2 +- internal/ci/repo/repo.cue | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ecfff2e0a1..36e5187ee66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,7 +66,7 @@ jobs: uses: actions/setup-go@v4 with: cache: false - go-version: 1.20.5 + go-version: 1.20.6 - name: Setup qemu uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/internal/ci/github/trybot.cue b/internal/ci/github/trybot.cue index b2de138054d..93bb90af2e5 100644 --- a/internal/ci/github/trybot.cue +++ b/internal/ci/github/trybot.cue @@ -90,7 +90,7 @@ workflows: trybot: _repo.bashWorkflow & { _testStrategy: { "fail-fast": false matrix: { - "go-version": ["1.19.x", _repo.latestStableGo] + "go-version": [_repo.previousStableGo, _repo.latestStableGo] runner: [_repo.linuxMachine, _repo.macosMachine, _repo.windowsMachine] } } diff --git a/internal/ci/repo/repo.cue b/internal/ci/repo/repo.cue index 885f62cb984..f396fd73b9b 100644 --- a/internal/ci/repo/repo.cue +++ b/internal/ci/repo/repo.cue @@ -28,6 +28,8 @@ linuxMachine: "ubuntu-22.04" macosMachine: "macos-11" windowsMachine: "windows-2022" +previousStableGo: "1.19.x" + // Use the latest Go version for extra checks, // such as running tests with the data race detector. latestStableGo: "1.20.x" @@ -35,7 +37,7 @@ latestStableGo: "1.20.x" // Use a specific latest version for release builds. // Note that we don't want ".x" for the sake of reproducibility, // so we instead pin a specific Go release. -pinnedReleaseGo: "1.20.5" +pinnedReleaseGo: "1.20.6" goreleaserVersion: "v1.18.2"