Skip to content

Commit 40cf328

Browse files
committed
Make CI jobs use the local Go toolchain
Previously the `test:fips` and other CI jobs downloaded and used the standard Go toolchain listed in `go.mod`. But we really want to build and test against the Go compiler provided in the build image, so set `GOTOOLCHAIN=local` accordingly. This came out of https://gitlab.com/gitlab-org/build/team-tasks/-/issues/13#note_2699786297.
1 parent 0a48f1d commit 40cf328

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ variables:
3434
DEFAULT_IMAGE: "registry.gitlab.com/gitlab-org/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:${IMAGE_TAG}"
3535
FIPS_IMAGE_TAG: "rubygems-3.5-git-2.49-exiftool-12.60"
3636
FIPS_IMAGE: "registry.gitlab.com/gitlab-org/gitlab-build-images/ubi-${UBI_VERSION}-ruby-${RUBY_VERSION}-golang-${GO_VERSION}-rust-${RUST_VERSION}:${FIPS_IMAGE_TAG}"
37+
GOTOOLCHAIN: local
3738

3839
workflow:
3940
rules: &workflow_rules # For merge requests, create a pipeline.
@@ -46,6 +47,7 @@ workflow:
4647
.rules:go-changes:
4748
rules:
4849
- changes:
50+
- .gitlab-ci.yml
4951
- "go.mod"
5052
- "go.sum"
5153
- "**/*.go"

0 commit comments

Comments
 (0)