From 0e4f2bdd0caf992950fab4f53554b8dbcb22cac3 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 9 Feb 2023 15:00:05 -0800 Subject: [PATCH] pull-toolchain.sh: don't run update-flake.sh We no longer carry an SRI hash for the toolchain, so flake updating is no longer needed for toolchain changes. Signed-off-by: David Anderson --- pull-toolchain.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pull-toolchain.sh b/pull-toolchain.sh index 5aba28a6d..f5a19e7d7 100755 --- a/pull-toolchain.sh +++ b/pull-toolchain.sh @@ -9,9 +9,8 @@ upstream=$(git ls-remote https://github.com/tailscale/go "$go_branch" | awk '{pr current=$(cat go.toolchain.rev) if [ "$upstream" != "$current" ]; then echo "$upstream" >go.toolchain.rev - ./update-flake.sh fi -if [ -n "$(git diff-index --name-only HEAD -- go.toolchain.rev go.mod.sri)" ]; then +if [ -n "$(git diff-index --name-only HEAD -- go.toolchain.rev)" ]; then echo "pull-toolchain.sh: changes imported. Use git commit to make them permanent." >&2 fi