Skip to content

Commit c0d83cd

Browse files
committed
go.toolchain.rev: bump Tailscale Go 1.24 for a Tailscale revert + upstream bump
Diff: tailscale/go@7c08383 This reverts our previous CGO_ENABLED change: tailscale/go@c1d3e9e It was causing depaware problems and is no longer necessary it seems? Upstream cmd/go is static nowadays. And pulls in: [release-branch.go1.24] doc/godebug: mention GODEBUG=fips140 [release-branch.go1.24] cmd/compile: avoid infinite recursion when inlining closures [release-branch.go1.24] syscall: don't truncate newly created files on Windows [release-branch.go1.24] runtime: fix usleep on s390x/linux [release-branch.go1.24] runtime: add some linknames back for `github.com/bytedance/sonic` Of those, really the only the 2nd and 3rd might affect us. Updates #15015 Updates tailscale/go#52 Change-Id: I0fa479f8b2d39f43f2dcdff6c28289dbe50b0773 Signed-off-by: Brad Fitzpatrick <[email protected]>
1 parent dcd7cd3 commit c0d83cd

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.github/workflows/test.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ jobs:
8989
~/.cache/go-build
9090
~/go/pkg/mod/cache
9191
~\AppData\Local\go-build
92-
# The -2- here should be incremented when the scheme of data to be
92+
# The -3- here should be incremented when the scheme of data to be
9393
# cached changes (e.g. path above changes).
94-
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-2-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
94+
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-3-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
9595
restore-keys: |
96-
${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-2-${{ hashFiles('**/go.sum') }}
97-
${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-2-
96+
${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-3-${{ hashFiles('**/go.sum') }}
97+
${{ github.job }}-${{ runner.os }}-${{ matrix.goarch }}-${{ matrix.buildflags }}-go-3-
9898
- name: build all
9999
if: matrix.buildflags == '' # skip on race builder
100100
run: ./tool/go build ${{matrix.buildflags}} ./...
@@ -163,12 +163,12 @@ jobs:
163163
~/.cache/go-build
164164
~/go/pkg/mod/cache
165165
~\AppData\Local\go-build
166-
# The -2- here should be incremented when the scheme of data to be
166+
# The -3- here should be incremented when the scheme of data to be
167167
# cached changes (e.g. path above changes).
168-
key: ${{ github.job }}-${{ runner.os }}-go-2-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
168+
key: ${{ github.job }}-${{ runner.os }}-go-3-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
169169
restore-keys: |
170-
${{ github.job }}-${{ runner.os }}-go-2-${{ hashFiles('**/go.sum') }}
171-
${{ github.job }}-${{ runner.os }}-go-2-
170+
${{ github.job }}-${{ runner.os }}-go-3-${{ hashFiles('**/go.sum') }}
171+
${{ github.job }}-${{ runner.os }}-go-3-
172172
- name: test
173173
run: go run ./cmd/testwrapper ./...
174174
- name: bench all
@@ -264,12 +264,12 @@ jobs:
264264
~/.cache/go-build
265265
~/go/pkg/mod/cache
266266
~\AppData\Local\go-build
267-
# The -2- here should be incremented when the scheme of data to be
267+
# The -3- here should be incremented when the scheme of data to be
268268
# cached changes (e.g. path above changes).
269-
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
269+
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
270270
restore-keys: |
271-
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-${{ hashFiles('**/go.sum') }}
272-
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-
271+
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-${{ hashFiles('**/go.sum') }}
272+
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-
273273
- name: build all
274274
run: ./tool/go build ./cmd/...
275275
env:
@@ -329,12 +329,12 @@ jobs:
329329
~/.cache/go-build
330330
~/go/pkg/mod/cache
331331
~\AppData\Local\go-build
332-
# The -2- here should be incremented when the scheme of data to be
332+
# The -3- here should be incremented when the scheme of data to be
333333
# cached changes (e.g. path above changes).
334-
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
334+
key: ${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
335335
restore-keys: |
336-
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-${{ hashFiles('**/go.sum') }}
337-
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-2-
336+
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-${{ hashFiles('**/go.sum') }}
337+
${{ github.job }}-${{ runner.os }}-${{ matrix.goos }}-${{ matrix.goarch }}-go-3-
338338
- name: build core
339339
run: ./tool/go build ./cmd/tailscale ./cmd/tailscaled
340340
env:
@@ -377,12 +377,12 @@ jobs:
377377
~/.cache/go-build
378378
~/go/pkg/mod/cache
379379
~\AppData\Local\go-build
380-
# The -2- here should be incremented when the scheme of data to be
380+
# The -3- here should be incremented when the scheme of data to be
381381
# cached changes (e.g. path above changes).
382-
key: ${{ github.job }}-${{ runner.os }}-go-2-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
382+
key: ${{ github.job }}-${{ runner.os }}-go-3-${{ hashFiles('**/go.sum') }}-${{ github.run_id }}
383383
restore-keys: |
384-
${{ github.job }}-${{ runner.os }}-go-2-${{ hashFiles('**/go.sum') }}
385-
${{ github.job }}-${{ runner.os }}-go-2-
384+
${{ github.job }}-${{ runner.os }}-go-3-${{ hashFiles('**/go.sum') }}
385+
${{ github.job }}-${{ runner.os }}-go-3-
386386
- name: build tsconnect client
387387
run: ./tool/go build ./cmd/tsconnect/wasm ./cmd/tailscale/cli
388388
env:

go.toolchain.rev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a529f1c329a97596448310cd52ab64047294b9d5
1+
2b494987ff3c1a6a26e10570c490394ff0a77aa4

0 commit comments

Comments
 (0)