diff --git a/internal/ci/base/github.cue b/internal/ci/base/github.cue index d9f081a2a..ff8f03613 100644 --- a/internal/ci/base/github.cue +++ b/internal/ci/base/github.cue @@ -16,13 +16,12 @@ bashWorkflow: json.#Workflow & { } installGo: json.#step & { - name: "Install Go" - uses: "actions/setup-go@v5" - with: { - // We do our own caching in setupGoActionsCaches. - cache: false - "go-version": string - } + #goVersion!: string + name: "Set GOTOOLCHAIN" + run: """ + echo "GOTOOLCHAIN=\(#goVersion)" >> $GITHUB_OUTPUT + go env + """ } checkoutCode: { @@ -100,7 +99,7 @@ checkoutCode: { earlyChecks: json.#step & { name: "Early git and code sanity checks" - run: "go run ./internal/ci/checks" + run: "go run ./internal/ci/checks" } curlGitHubAPI: { diff --git a/internal/ci/github/release.cue b/internal/ci/github/release.cue index f4d701bd8..c26198559 100644 --- a/internal/ci/github/release.cue +++ b/internal/ci/github/release.cue @@ -45,7 +45,7 @@ workflows: release: _repo.bashWorkflow & { steps: [ for v in _repo.checkoutCode {v}, _repo.installGo & { - with: "go-version": _repo.pinnedReleaseGo + #goVersion: _repo.pinnedReleaseGo }, json.#step & { name: "Setup qemu" diff --git a/internal/ci/github/trybot.cue b/internal/ci/github/trybot.cue index 4f9ce1c8a..05ba0ab59 100644 --- a/internal/ci/github/trybot.cue +++ b/internal/ci/github/trybot.cue @@ -52,7 +52,7 @@ workflows: trybot: _repo.bashWorkflow & { for v in _repo.checkoutCode {v}, _repo.installGo & { - with: "go-version": goVersionVal + #goVersion: goVersionVal }, // cachePre must come after installing Node and Go, because the cache locations diff --git a/internal/ci/repo/repo.cue b/internal/ci/repo/repo.cue index 1cf7ca7cb..635ffa395 100644 --- a/internal/ci/repo/repo.cue +++ b/internal/ci/repo/repo.cue @@ -31,11 +31,11 @@ windowsMachine: "windows-2022" // Use the latest Go version for extra checks, // such as running tests with the data race detector. // This may be a release candidate if we are late into a Go release cycle. -latestGo: "1.23.x" +latestGo: "1.23.0" // The list of all Go versions that we run our tests on. // This typically goes back one major Go version, as we support two at a time. -matrixGo: ["1.22.x", latestGo] +matrixGo: ["1.22.6", latestGo] // Use a specific latest version for release builds. // Note that we don't want ".x" for the sake of reproducibility,