From 3ce5e209971d008f475836efd2ec16b75514bb4c Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Fri, 2 Oct 2026 10:59:48 +0100 Subject: [PATCH] go.mod,cmd/cigocacher: migrate to depending on tb (#21627) Building cigocacher from the corp repo failed because its go.mod was missing a reference to go-tool-cache. Migrate cigocacher over to tb so it's not required. Updates tailscale/corp#49137 Signed-off-by: Tom Proctor --- cmd/cigocacher/cigocacher.go | 4 ++-- flake.nix | 2 +- flakehashes.json | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- shell.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/cigocacher/cigocacher.go b/cmd/cigocacher/cigocacher.go index 02f68980f..e811569f6 100644 --- a/cmd/cigocacher/cigocacher.go +++ b/cmd/cigocacher/cigocacher.go @@ -29,8 +29,8 @@ import ( "sync/atomic" "time" - "github.com/bradfitz/go-tool-cache/cacheproc" - "github.com/bradfitz/go-tool-cache/cachers" + "github.com/tailscale/tb/gocache/cacheproc" + "github.com/tailscale/tb/gocache/cachers" ) func main() { diff --git a/flake.nix b/flake.nix index 312f2b5ba..6eef825c6 100644 --- a/flake.nix +++ b/flake.nix @@ -173,4 +173,4 @@ }); }; } -# nix-direnv cache busting line: sha256-f9abuyk1qvVr6MPpfmHay6p/U/+8flm1SBmHGjZa1aU= \ No newline at end of file +# nix-direnv cache busting line: sha256-VmRpM3dgdfYrBRDHlOzcPgCvvoPkuPug08FFWEDrjh4= \ No newline at end of file diff --git a/flakehashes.json b/flakehashes.json index 351379850..d57a0fd43 100644 --- a/flakehashes.json +++ b/flakehashes.json @@ -4,7 +4,7 @@ "sri": "sha256-qxNiwlI/KJpwx7VZQU9C5puJGMUtN5vBXm3ApNYIolI=" }, "vendor": { - "goModSum": "sha256-hjoZGDJvJX1RT3uIKMrk7o7HiMJYPP1NNqfsSd0+Dqw=", - "sri": "sha256-f9abuyk1qvVr6MPpfmHay6p/U/+8flm1SBmHGjZa1aU=" + "goModSum": "sha256-3ZSPStrydtR4zde8G+JCc2YinFB7k2wvPRGMl5Mq2yk=", + "sri": "sha256-VmRpM3dgdfYrBRDHlOzcPgCvvoPkuPug08FFWEDrjh4=" } } diff --git a/go.mod b/go.mod index b91e97067..6e58b0b66 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/aws/smithy-go v1.28.1 github.com/axiomhq/hyperloglog v0.2.6 github.com/benbjohnson/immutable v0.4.3 - github.com/bradfitz/go-tool-cache v0.0.0-20260919185303-c660171c910c github.com/bradfitz/monogok v0.0.0-20260630033929-b1eef977b41f github.com/bradfitz/qemu-guest-kragent v0.0.0-20240513123539-55a43ea02a03 github.com/bradfitz/reco v0.0.0-20260929154613-b883fbd17e3f @@ -122,6 +121,7 @@ require ( github.com/tailscale/peercred v0.0.0-20250107143737-35a0c7bd7edc github.com/tailscale/policybottest v0.0.0-20260626205140-6863b672b210 github.com/tailscale/setec v0.0.0-20260824224040-f8d7a936837c + github.com/tailscale/tb v0.0.0-20261001153419-d666f92605bc github.com/tailscale/ts-gokrazy v0.0.0-20260630224145-b83088f2e52e github.com/tailscale/web-client-prebuilt v0.0.0-20260917222731-e0ed2d0d0fea github.com/tailscale/wf v0.0.0-20240214030419-6fbb0a674ee6 diff --git a/go.sum b/go.sum index 6f987991c..75c0445d1 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,6 @@ github.com/bombsimon/wsl/v4 v4.7.0 h1:1Ilm9JBPRczjyUs6hvOPKvd7VL1Q++PL8M0SXBDf+j github.com/bombsimon/wsl/v4 v4.7.0/go.mod h1:uV/+6BkffuzSAVYD+yGyld1AChO7/EuLrCF/8xTiapg= github.com/bombsimon/wsl/v5 v5.9.0 h1:WCrgZ7RQnZO5oEwbVTlYgBdU3wL294kR1BSWV8vTfsU= github.com/bombsimon/wsl/v5 v5.9.0/go.mod h1:kjo4HiAV5FDkHC8/uzJq9mBffEEd6WT/nvN7DoMovDM= -github.com/bradfitz/go-tool-cache v0.0.0-20260919185303-c660171c910c h1:9TulZxZIanagyWV3nc5jU5k7j4l+6ynAxRfpoden2F4= -github.com/bradfitz/go-tool-cache v0.0.0-20260919185303-c660171c910c/go.mod h1:CwMr4SG9k92ZvGJ7EnopI0qYUSya3aZHAEdaSi2sR3k= github.com/bradfitz/monogok v0.0.0-20260630033929-b1eef977b41f h1:voy0korWbg2e1gsJpBZ8/OBhVL8evXeUwbCZcA1PWv8= github.com/bradfitz/monogok v0.0.0-20260630033929-b1eef977b41f/go.mod h1:TG1HbU9fRVDnNgXncVkKz9GdvjIvqquXjH6QZSEVmY4= github.com/bradfitz/qemu-guest-kragent v0.0.0-20240513123539-55a43ea02a03 h1:V1gD/xbQZtimHXZ0y19oMgTVBIXQyazG/mG9JIflrIY= @@ -1146,6 +1144,8 @@ github.com/tailscale/policybottest v0.0.0-20260626205140-6863b672b210 h1:gSw3mUo github.com/tailscale/policybottest v0.0.0-20260626205140-6863b672b210/go.mod h1:vxp6PAfQH5JOeS5GsrHHbsALlo+1ZIELanBwaP89wrc= github.com/tailscale/setec v0.0.0-20260824224040-f8d7a936837c h1:J0aTCtzXxik475w8EXUbP/0LK6l3+06MwWdybrsXOmM= github.com/tailscale/setec v0.0.0-20260824224040-f8d7a936837c/go.mod h1:ILYCfHqZuCwIE4+ajWhLYaFBkoYij3P1uFv4K86BhRA= +github.com/tailscale/tb v0.0.0-20261001153419-d666f92605bc h1:FEiCSGz4TvNsTHmHcc4X1kZyulblDsZHRn1KmLkYnAE= +github.com/tailscale/tb v0.0.0-20261001153419-d666f92605bc/go.mod h1:gOMjUuglKUteyCW0Sc6huHllNtJporo6nkDxFynhfVU= github.com/tailscale/ts-gokrazy v0.0.0-20260630224145-b83088f2e52e h1:+ot1gXs22BhqoStjwo2YSoZppGl/xovy31V29trAPeE= github.com/tailscale/ts-gokrazy v0.0.0-20260630224145-b83088f2e52e/go.mod h1:mu0sethAvP7xItcfBAxMJWiXZ3ZQ5qbKmjPYizOkSHE= github.com/tailscale/web-client-prebuilt v0.0.0-20260917222731-e0ed2d0d0fea h1:ah5jt6ZnxMvNclt6kBBoLcMpLLjMA44PTsnov2y7gpU= diff --git a/shell.nix b/shell.nix index b4160f4d4..fd0b737e2 100644 --- a/shell.nix +++ b/shell.nix @@ -16,4 +16,4 @@ ) { src = ./.; }).shellNix -# nix-direnv cache busting line: sha256-f9abuyk1qvVr6MPpfmHay6p/U/+8flm1SBmHGjZa1aU= +# nix-direnv cache busting line: sha256-VmRpM3dgdfYrBRDHlOzcPgCvvoPkuPug08FFWEDrjh4=