Skip to content

Commit 7232097

Browse files
authored
Merge pull request #159186 from dt/backport26.1-159120
release-26.1: build: bump go fork SHA for runtime.Yield and goroutine profiles
2 parents 86ca2bd + 3c8510c commit 7232097

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ load(
185185
go_download_sdk(
186186
name = "go_sdk",
187187
sdks = {
188-
"darwin_arm64": ("go1.25.3.darwin-arm64.tar.gz", "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792"),
189-
"linux_amd64": ("go1.25.3.linux-amd64.tar.gz", "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7"),
190-
"linux_arm64": ("go1.25.3.linux-arm64.tar.gz", "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598"),
191-
"linux_s390x": ("go1.25.3.linux-s390x.tar.gz", "6d080fdd7333c8c84d679119613b7dc6b8703dc45f7231be78ba13e0523ffd50"),
192-
"windows_amd64": ("go1.25.3.windows-amd64.tar.gz", "2f108bdf9956d0e1620d6277ecf761438f4562f7d551ca6258e8579875cf1ce5"),
188+
"darwin_arm64": ("go1.25.3.darwin-arm64.tar.gz", "52c5c195a9dff3462f4926df7f523ab4e72d008bb481e1a5a2b1d3a91201ab9b"),
189+
"linux_amd64": ("go1.25.3.linux-amd64.tar.gz", "50c53742691b1325a9279dcefbc90121e8a9da94652fa393885f49e95fdfb096"),
190+
"linux_arm64": ("go1.25.3.linux-arm64.tar.gz", "043edbf881d032155ce79187f27344ed1ed5d32a98e069dfe734b4854ed4ab34"),
191+
"linux_s390x": ("go1.25.3.linux-s390x.tar.gz", "1b584edfdacfdc390f507bca85b5d1034ce4cc4c1089a12da3dd7f55f87d5a24"),
192+
"windows_amd64": ("go1.25.3.windows-amd64.tar.gz", "8b62f1feb0aad2a1a80792316a9b4563d14f21d88d5a821c8c3b0be09d087172"),
193193
},
194-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/{}"],
194+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/{}"],
195195
version = "1.25.3",
196196
)
197197

build/bazelutil/distdir_files.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,11 +1186,11 @@ DISTDIR_FILES = {
11861186
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
11871187
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
11881188
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
1189-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.darwin-arm64.tar.gz": "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792",
1190-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-amd64.tar.gz": "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7",
1191-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-arm64.tar.gz": "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598",
1192-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-s390x.tar.gz": "6d080fdd7333c8c84d679119613b7dc6b8703dc45f7231be78ba13e0523ffd50",
1193-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.windows-amd64.tar.gz": "2f108bdf9956d0e1620d6277ecf761438f4562f7d551ca6258e8579875cf1ce5",
1189+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.darwin-arm64.tar.gz": "52c5c195a9dff3462f4926df7f523ab4e72d008bb481e1a5a2b1d3a91201ab9b",
1190+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-amd64.tar.gz": "50c53742691b1325a9279dcefbc90121e8a9da94652fa393885f49e95fdfb096",
1191+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-arm64.tar.gz": "043edbf881d032155ce79187f27344ed1ed5d32a98e069dfe734b4854ed4ab34",
1192+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-s390x.tar.gz": "1b584edfdacfdc390f507bca85b5d1034ce4cc4c1089a12da3dd7f55f87d5a24",
1193+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.windows-amd64.tar.gz": "8b62f1feb0aad2a1a80792316a9b4563d14f21d88d5a821c8c3b0be09d087172",
11941194
"https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41",
11951195
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_jest-v0.18.4.tar.gz": "d3bb833f74b8ad054e6bff5e41606ff10a62880cc99e4d480f4bdfa70add1ba7",
11961196
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_js-v1.42.3.tar.gz": "2cfb3875e1231cefd3fada6774f2c0c5a99db0070e0e48ea398acbff7c6c765b",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9bec28dcd0f7a372d89ef9292cc72c33bf4c7cba
1+
392609326d3b3ae02ec91dbe02ac2d60f5d4ee1e

build/teamcity/internal/release/build-and-publish-patched-go/impl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ for CONFIG in $CONFIGS; do
117117
mv go/bin/${GOOS}_$GOARCH/* go/bin
118118
rm -r go/bin/${GOOS}_$GOARCH
119119
fi
120-
tar cf - go | gzip -9 > /artifacts/go$GOVERS.$GOOS-$GOARCH.tar.gz
120+
tar --exclude='.git' -cf - go | gzip -9 > /artifacts/go$GOVERS.$GOOS-$GOARCH.tar.gz
121121
rm -rf go/bin
122122
done
123123

build/teamcity/internal/release/publish-patched-go-for-mac.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ publish() {
2525
gsutil cp $archive gs://public-bazel-artifacts/go/$loc/$archive
2626
mv $archive artifacts
2727
}
28-
publish amd64
2928
publish arm64
3029

build/teamcity/internal/release/sign-patched-go.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [[ $service_account != "[email protected]
1515
fi
1616

1717
cleanup() {
18-
rm -rf darwin.zip staging darwin-amd64 darwin-arm64 ./*.tar.gz TIMESTAMP.txt
18+
rm -rf darwin.zip staging darwin-arm64 ./*.tar.gz TIMESTAMP.txt
1919
rm -rf .secrets
2020
}
2121
trap cleanup EXIT
@@ -41,7 +41,7 @@ sign() {
4141
--code-signature-flags runtime \
4242
"darwin-$1/go/bin/$bin"
4343
done
44-
tar cf - -C "darwin-$1" go | gzip -9 > "artifacts/$archive"
44+
tar --exclude='.git' -cf - -C "darwin-$1" go | gzip -9 > "artifacts/$archive"
4545
mkdir staging
4646
cp "darwin-$1/go/bin/gofmt" staging
4747
cp "darwin-$1/go/bin/go" staging
@@ -53,5 +53,4 @@ sign() {
5353
darwin.zip
5454
}
5555

56-
sign amd64
5756
sign arm64

0 commit comments

Comments
 (0)