mirror/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-03-26 10:11:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

pull-toolchain.sh: advance the next hash if it's behind

Browse Source 
Updates tailscale/corp#36382

Change-Id: Ida55b7b1a2cdd0a4653bb41852008e7088fc4a48
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2026-03-10 13:45:29 +00:00
committed by Brad Fitzpatrick
parent 16c4780f0a
commit 32adca78f1
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pull-toolchain.sh
View File

@@ -20,6 +20,32 @@ if [ "$upstream" != "$current" ]; then
echo "$upstream" >"$go_toolchain_rev_file"
fi
# When updating the regular (non-next) toolchain, also bump go.toolchain.next.rev
# if it has fallen behind on the same branch. This happens when "next" was tracking
# a release candidate (e.g. Go 1.26.0rc2) and the regular toolchain later gets
# bumped to a newer release (e.g. Go 1.26.2) on the same branch. At that point
# the "next" rev shouldn't still point at the older RC.
if [ "${TS_GO_NEXT:-}" != "1" ]; then
read -r next_branch <go.toolchain.next.branch
if [ "$go_branch" = "$next_branch" ]; then
next_rev=$(cat go.toolchain.next.rev)
new_rev=$(cat go.toolchain.rev)
if [ "$next_rev" != "$new_rev" ]; then
# Fetch only commit objects (no trees/blobs) with limited depth
# to keep this fast — we just need the commit graph for ancestry check.
tmpdir="/tmp/tailscale-pull-toolchain-$$"
if git clone --bare --filter=tree:0 --depth=20000 --single-branch --branch "$go_branch" \
https://github.com/tailscale/go "$tmpdir" 2>/dev/null; then
if git -C "$tmpdir" merge-base --is-ancestor "$next_rev" "$new_rev" 2>/dev/null; then
echo "$new_rev" >go.toolchain.next.rev
echo "pull-toolchain.sh: also bumped go.toolchain.next.rev to match (was behind on same branch)" >&2
fi
fi
rm -rf "$tmpdir"
fi
fi
fi
# Only update go.toolchain.version and go.toolchain.rev.sri for the main toolchain,
# skipping it if TS_GO_NEXT=1. Those two files are only used by Nix, and as of 2026-01-26
# don't yet support TS_GO_NEXT=1 with flake.nix or in our corp CI.
@@ -29,6 +55,6 @@ if [ "${TS_GO_NEXT:-}" != "1" ]; then
./update-flake.sh
fi
if [ -n "$(git diff-index --name-only HEAD -- "$go_toolchain_rev_file" go.toolchain.rev.sri go.toolchain.version)" ]; then
if [ -n "$(git diff-index --name-only HEAD -- "$go_toolchain_rev_file" go.toolchain.next.rev go.toolchain.rev.sri go.toolchain.version)" ]; then
echo "pull-toolchain.sh: changes imported. Use git commit to make them permanent." >&2
fi