Skip to content

Commit a5d7ea5

Browse files
authored
Merge pull request #150868 from rickystewart/release-25.3-go-upgrade-s390x-patches
build: upgrade Go to 1.23.11, add `s390x` performance patches
2 parents 8485549 + 7dd7525 commit a5d7ea5

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ build:crosslinuxfips '--workspace_status_command=./build/bazelutil/stamp.sh -t x
100100
build:crosslinuxfips --config=crosslinuxfipsbase
101101
build:crosslinuxfipsbase --platforms=//build/toolchains:cross_linux
102102
build:crosslinuxfipsbase --config=cross
103-
build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.23.7fips
103+
build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.23.11fips
104104
build:crosswindows '--workspace_status_command=./build/bazelutil/stamp.sh -t x86_64-w64-mingw32'
105105
build:crosswindows --config=crosswindowsbase
106106
build:crosswindowsbase --platforms=//build/toolchains:cross_windows

WORKSPACE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ load(
167167
go_download_sdk(
168168
name = "go_sdk",
169169
sdks = {
170-
"darwin_amd64": ("go1.23.7.darwin-amd64.tar.gz", "d26ec0c7ce5975a334b1c343de8eb7aa8777fac278440cc2204b76eab867b3ef"),
171-
"darwin_arm64": ("go1.23.7.darwin-arm64.tar.gz", "3c1ab410d0828951cddde4959b72ef33aedbce8e3c8aa9c76cc4a094043fef43"),
172-
"linux_amd64": ("go1.23.7.linux-amd64.tar.gz", "b69a06004491883f176b0ec600a7efbb3ec9450561653d8f509fc10d43176492"),
173-
"linux_arm64": ("go1.23.7.linux-arm64.tar.gz", "4b0922c371650ec1fda259f41abc98412abf149b8d358daa5e5bc7c553bc6e52"),
174-
"linux_s390x": ("go1.23.7.linux-s390x.tar.gz", "25f0cb7d7683cd9df1e194852a1856ac905be5c001759bab7862dad7aedc626d"),
175-
"windows_amd64": ("go1.23.7.windows-amd64.tar.gz", "265efcbe685b3737f317c52e13eaa444bc205ad6a5e676f59d229ec4dc5821d1"),
170+
"darwin_amd64": ("go1.23.11.darwin-amd64.tar.gz", "7139176cc006fc2f798fd5527a9c601dffe281c2cf63080934a318d3c424f3fd"),
171+
"darwin_arm64": ("go1.23.11.darwin-arm64.tar.gz", "efc9a6724b17624a0888ef407398ac82da4eb4d6da3717532645fade19ffa709"),
172+
"linux_amd64": ("go1.23.11.linux-amd64.tar.gz", "5f38c94984ff94d551e2c7fb8afac1d9e3bd9c3276d6f2b8dae1c07a2da7007d"),
173+
"linux_arm64": ("go1.23.11.linux-arm64.tar.gz", "69e5e5aca3e105c0cfa8ed024117e54c9c23b9848d470a95d3df946ae63a9fc3"),
174+
"linux_s390x": ("go1.23.11.linux-s390x.tar.gz", "5beff97b93c78389cbdef2321ee8a0bcafdba25056168674dd12fb07882069c3"),
175+
"windows_amd64": ("go1.23.11.windows-amd64.tar.gz", "d20428242b278d1bc1761d9f8cdc052b468e3e03bd6f7c01cfc507475231e02a"),
176176
},
177-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
178-
version = "1.23.7",
177+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/{}"],
178+
version = "1.23.11",
179179
)
180180

181181
# To point to a local SDK path, use the following instead. We'll call the
@@ -659,8 +659,8 @@ go_download_sdk(
659659
# able to provide additional diagnostic information such as the expected version of OpenSSL.
660660
experiments = ["boringcrypto"],
661661
sdks = {
662-
"linux_amd64": ("go1.23.7fips.linux-amd64.tar.gz", "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961"),
662+
"linux_amd64": ("go1.23.11fips.linux-amd64.tar.gz", "23f69e799bdcf8244e23d21692b5bf49a3beb8e8a5493e3a1052f65705be2474"),
663663
},
664-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
665-
version = "1.23.7fips",
664+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/{}"],
665+
version = "1.23.11fips",
666666
)

build/bazelutil/distdir_files.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,13 +1208,13 @@ DISTDIR_FILES = {
12081208
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20241202-211651/libproj_foreign.macos.20241202-211651.tar.gz": "b0a672f24748c24c941884c04413fd8e20afd6bca95e0451f3cfb15dd2cc1eb9",
12091209
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20241202-211651/libproj_foreign.macosarm.20241202-211651.tar.gz": "a35706bf0112e9652d6e41501113ee0f0f392b67e495979c867f71f17cf6ce7e",
12101210
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20241202-211651/libproj_foreign.windows.20241202-211651.tar.gz": "a33b64a784e856dbb3c84a52075227c48f0ff52a858639c3737a8911201d0c65",
1211-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-amd64.tar.gz": "d26ec0c7ce5975a334b1c343de8eb7aa8777fac278440cc2204b76eab867b3ef",
1212-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-arm64.tar.gz": "3c1ab410d0828951cddde4959b72ef33aedbce8e3c8aa9c76cc4a094043fef43",
1213-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-amd64.tar.gz": "b69a06004491883f176b0ec600a7efbb3ec9450561653d8f509fc10d43176492",
1214-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-arm64.tar.gz": "4b0922c371650ec1fda259f41abc98412abf149b8d358daa5e5bc7c553bc6e52",
1215-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-s390x.tar.gz": "25f0cb7d7683cd9df1e194852a1856ac905be5c001759bab7862dad7aedc626d",
1216-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.windows-amd64.tar.gz": "265efcbe685b3737f317c52e13eaa444bc205ad6a5e676f59d229ec4dc5821d1",
1217-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7fips.linux-amd64.tar.gz": "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961",
1211+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.darwin-amd64.tar.gz": "7139176cc006fc2f798fd5527a9c601dffe281c2cf63080934a318d3c424f3fd",
1212+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.darwin-arm64.tar.gz": "efc9a6724b17624a0888ef407398ac82da4eb4d6da3717532645fade19ffa709",
1213+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.linux-amd64.tar.gz": "5f38c94984ff94d551e2c7fb8afac1d9e3bd9c3276d6f2b8dae1c07a2da7007d",
1214+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.linux-arm64.tar.gz": "69e5e5aca3e105c0cfa8ed024117e54c9c23b9848d470a95d3df946ae63a9fc3",
1215+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.linux-s390x.tar.gz": "5beff97b93c78389cbdef2321ee8a0bcafdba25056168674dd12fb07882069c3",
1216+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11.windows-amd64.tar.gz": "d20428242b278d1bc1761d9f8cdc052b468e3e03bd6f7c01cfc507475231e02a",
1217+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250728-204441/go1.23.11fips.linux-amd64.tar.gz": "23f69e799bdcf8244e23d21692b5bf49a3beb8e8a5493e3a1052f65705be2474",
12181218
"https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41",
12191219
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_jest-v0.18.4.tar.gz": "d3bb833f74b8ad054e6bff5e41606ff10a62880cc99e4d480f4bdfa70add1ba7",
12201220
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_js-v1.42.3.tar.gz": "2cfb3875e1231cefd3fada6774f2c0c5a99db0070e0e48ea398acbff7c6c765b",

build/bootstrap/bootstrap-debian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ sudo tar -C /usr --strip-components=1 -zxf /tmp/cmake.tgz && rm /tmp/cmake.tgz
4545

4646
# Install Go.
4747
trap 'rm -f /tmp/go.tgz' EXIT
48-
curl -fsSL https://dl.google.com/go/go1.23.7.linux-amd64.tar.gz >/tmp/go.tgz
48+
curl -fsSL https://dl.google.com/go/go1.23.11.linux-amd64.tar.gz >/tmp/go.tgz
4949
sha256sum -c - <<EOF
50-
4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3 /tmp/go.tgz
50+
80899df77459e0b551d2eb8800ad6eb47023b99cccbf8129e7b5786770b948c5 /tmp/go.tgz
5151
EOF
5252
sudo tar -C /usr/local -zxf /tmp/go.tgz && rm /tmp/go.tgz
5353

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4eca4292cae8f25b834db7001ff25284b1f9ccfa
1+
1885f636683f838d9dab4a27c196bea2eb065c02

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
set -xeuo pipefail
1010

1111
# When updating to a new Go version, update all of these variables.
12-
GOVERS=1.23.7
12+
GOVERS=1.23.11
1313
GOCOMMIT=$(grep -v ^# /bootstrap/commit.txt | head -n1)
1414
# We use this for bootstrapping (this is NOT re-published). Note the version
1515
# matches the version we're publishing, although it doesn't technically have to.
1616
GOLINUXLINK=https://go.dev/dl/go$GOVERS.linux-amd64.tar.gz
17-
LINUXSHASUM=4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3
17+
LINUXSHASUM=80899df77459e0b551d2eb8800ad6eb47023b99cccbf8129e7b5786770b948c5
1818
1919
apt-get update
2020
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cockroachdb/cockroach
22

3-
go 1.23.7
3+
go 1.23.11
44

55
// golang.org/x/* packages are maintained and curated by the go project, just
66
// without the backwards compatibility promises the standard library, and thus

pkg/cmd/roachtest/tests/cdc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4143,7 +4143,7 @@ const createMSKTopicBinPath = "/tmp/create-msk-topic"
41434143
var setupMskTopicScript = fmt.Sprintf(`
41444144
#!/bin/bash
41454145
set -e -o pipefail
4146-
wget https://go.dev/dl/go1.23.7.linux-amd64.tar.gz -O /tmp/go.tar.gz
4146+
wget https://go.dev/dl/go1.23.11.linux-amd64.tar.gz -O /tmp/go.tar.gz
41474147
sudo rm -rf /usr/local/go
41484148
sudo tar -C /usr/local -xzf /tmp/go.tar.gz
41494149
echo export PATH=$PATH:/usr/local/go/bin >> ~/.profile

0 commit comments

Comments
 (0)