Skip to content

Commit 948c846

Browse files
committed
Fix CI
1 parent a300fba commit 948c846

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414
env:
1515
MAKEFLAGS: "-j 2"
16-
# actions/setup-go@v6 sets GOTOOLCHAIN=local; override so go.mod's `go` directive
17-
# can bootstrap a newer toolchain via the module proxy when the runner image lags.
18-
GOTOOLCHAIN: auto
1916
jobs:
2017
lint:
2118
runs-on: ubuntu-latest
@@ -51,6 +48,10 @@ jobs:
5148
- name: make-lint
5249
run: make lint
5350
env:
51+
# actions/setup-go@v6 exports GOTOOLCHAIN=local via $GITHUB_ENV; override at the
52+
# step level so go.mod's `go` directive can bootstrap a newer toolchain via the
53+
# module proxy when the runner image lags behind.
54+
GOTOOLCHAIN: auto
5455
BUF_BREAKING_AGAINST_INPUT: "https://github.com/bufbuild/buf.git#branch=main"
5556
BUF_INPUT_HTTPS_USERNAME: ${{ github.actor }}
5657
BUF_INPUT_HTTPS_PASSWORD: ${{ github.token }}

.github/workflows/previous.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ concurrency:
1313
cancel-in-progress: true
1414
env:
1515
MAKEFLAGS: "-j 2"
16-
# actions/setup-go@v6 sets GOTOOLCHAIN=local; override so go.mod's `go` directive
17-
# can bootstrap a newer toolchain via the module proxy when the runner image lags.
18-
GOTOOLCHAIN: auto
1916
jobs:
2017
test-previous:
2118
strategy:
@@ -44,3 +41,8 @@ jobs:
4441
${{ runner.os }}-${{ matrix.go-version }}-buf-
4542
- name: make-test
4643
run: make test
44+
env:
45+
# actions/setup-go@v6 exports GOTOOLCHAIN=local via $GITHUB_ENV; override at the
46+
# step level so go.mod's `go` directive can bootstrap a newer toolchain via the
47+
# module proxy when the runner image lags behind.
48+
GOTOOLCHAIN: auto

0 commit comments

Comments
 (0)