Skip to content

Commit 44ca73c

Browse files
committed
*: revert "upgrade to Go 1.24.5"
This reverts commit 8f1144f. Release note (build change): Revert Go version back to 1.23.7. Epic: none
1 parent 38c2d5c commit 44ca73c

File tree

30 files changed

+149
-186
lines changed

30 files changed

+149
-186
lines changed

.bazelrc

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

DEPS.bzl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6300,6 +6300,16 @@ def go_deps():
63006300
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mgutz/ansi/com_github_mgutz_ansi-v0.0.0-20200706080929-d51e80ef957d.zip",
63016301
],
63026302
)
6303+
go_repository(
6304+
name = "com_github_mibk_dupl",
6305+
build_file_proto_mode = "disable_global",
6306+
importpath = "github.com/mibk/dupl",
6307+
sha256 = "73f61090c1cbee024b771fc60804cbedc5c2861f232bd34eff719afd9ac6e098",
6308+
strip_prefix = "github.com/mibk/[email protected]",
6309+
urls = [
6310+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mibk/dupl/com_github_mibk_dupl-v1.0.0.zip",
6311+
],
6312+
)
63036313
go_repository(
63046314
name = "com_github_michaeltjones_walk",
63056315
build_file_proto_mode = "disable_global",

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.24.5.darwin-amd64.tar.gz", "fe734af1e334e3dcf0a56905b7aac464a84520c651deb1d590560ca1cdd1d6d9"),
171-
"darwin_arm64": ("go1.24.5.darwin-arm64.tar.gz", "61585ac4a6d3f1154e664e9639b16d3c715d5364a9d5a297ada93a34991cd785"),
172-
"linux_amd64": ("go1.24.5.linux-amd64.tar.gz", "65b0631fc8121287cacbfb65ebe65bfa6896336882445ee4577b68378b80b08b"),
173-
"linux_arm64": ("go1.24.5.linux-arm64.tar.gz", "de29f7d0591a83d93f587b03008817d0968c0e92c03b17197f782ded9a80f980"),
174-
"linux_s390x": ("go1.24.5.linux-s390x.tar.gz", "88cc416c2e9480def4ca2d9a1ef89524a1955a77dba13e1cd70c20a741a5ac9f"),
175-
"windows_amd64": ("go1.24.5.windows-amd64.tar.gz", "ee3641b9e28ecd14d0bfaeb7f796548010bedab70a307e59c6acee86eb520b60"),
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"),
176176
},
177-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/{}"],
178-
version = "1.24.5",
177+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
178+
version = "1.23.7",
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.24.5fips.linux-amd64.tar.gz", "85f2fefb498ff4449ba560cf71cb2067e14c504ea91f613cf369f5028a58e034"),
662+
"linux_amd64": ("go1.23.7fips.linux-amd64.tar.gz", "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961"),
663663
},
664-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/{}"],
665-
version = "1.24.5fips",
664+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
665+
version = "1.23.7fips",
666666
)

build/bazelutil/distdir_files.bzl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ DISTDIR_FILES = {
783783
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/matttproud/golang_protobuf_extensions/com_github_matttproud_golang_protobuf_extensions-v1.0.4.zip": "0b44aabaa9aea5d28e667849ad4d9821351466c3591dd7beddb2d025db6d55f2",
784784
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mediocregopher/radix/v3/com_github_mediocregopher_radix_v3-v3.4.2.zip": "5be7566cd32610078fa12461b09b674061efb955b2400625ba8ebf3f6182c287",
785785
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mgutz/ansi/com_github_mgutz_ansi-v0.0.0-20200706080929-d51e80ef957d.zip": "2e0c063f9597cb225904292981732f10298e95aa22a1b815297e318ba103dc1d",
786+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mibk/dupl/com_github_mibk_dupl-v1.0.0.zip": "73f61090c1cbee024b771fc60804cbedc5c2861f232bd34eff719afd9ac6e098",
786787
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/microcosm-cc/bluemonday/com_github_microcosm_cc_bluemonday-v1.0.23.zip": "d720813b959b6713e000407778188cdc3b88cf3235a3dfda6543d7c5e748da6d",
787788
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/miekg/dns/com_github_miekg_dns-v1.1.43.zip": "98eaddff5c30e475850f8f9c170bfb1adf33f0aaeeb280f71e77808a1dd902aa",
788789
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/miekg/pkcs11/com_github_miekg_pkcs11-v1.1.1.zip": "81cfc2922f7d5c59dc1e688d6247ec8dc35246d646ab27088847a232570c76e6",
@@ -1208,13 +1209,13 @@ DISTDIR_FILES = {
12081209
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
12091210
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
12101211
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
1211-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-amd64.tar.gz": "fe734af1e334e3dcf0a56905b7aac464a84520c651deb1d590560ca1cdd1d6d9",
1212-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-arm64.tar.gz": "61585ac4a6d3f1154e664e9639b16d3c715d5364a9d5a297ada93a34991cd785",
1213-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-amd64.tar.gz": "65b0631fc8121287cacbfb65ebe65bfa6896336882445ee4577b68378b80b08b",
1214-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-arm64.tar.gz": "de29f7d0591a83d93f587b03008817d0968c0e92c03b17197f782ded9a80f980",
1215-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-s390x.tar.gz": "88cc416c2e9480def4ca2d9a1ef89524a1955a77dba13e1cd70c20a741a5ac9f",
1216-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.windows-amd64.tar.gz": "ee3641b9e28ecd14d0bfaeb7f796548010bedab70a307e59c6acee86eb520b60",
1217-
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5fips.linux-amd64.tar.gz": "85f2fefb498ff4449ba560cf71cb2067e14c504ea91f613cf369f5028a58e034",
1212+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-amd64.tar.gz": "d26ec0c7ce5975a334b1c343de8eb7aa8777fac278440cc2204b76eab867b3ef",
1213+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-arm64.tar.gz": "3c1ab410d0828951cddde4959b72ef33aedbce8e3c8aa9c76cc4a094043fef43",
1214+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-amd64.tar.gz": "b69a06004491883f176b0ec600a7efbb3ec9450561653d8f509fc10d43176492",
1215+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-arm64.tar.gz": "4b0922c371650ec1fda259f41abc98412abf149b8d358daa5e5bc7c553bc6e52",
1216+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-s390x.tar.gz": "25f0cb7d7683cd9df1e194852a1856ac905be5c001759bab7862dad7aedc626d",
1217+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.windows-amd64.tar.gz": "265efcbe685b3737f317c52e13eaa444bc205ad6a5e676f59d229ec4dc5821d1",
1218+
"https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7fips.linux-amd64.tar.gz": "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961",
12181219
"https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41",
12191220
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_jest-v0.18.4.tar.gz": "d3bb833f74b8ad054e6bff5e41606ff10a62880cc99e4d480f4bdfa70add1ba7",
12201221
"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.24.5.linux-amd64.tar.gz >/tmp/go.tgz
48+
curl -fsSL https://dl.google.com/go/go1.23.7.linux-amd64.tar.gz >/tmp/go.tgz
4949
sha256sum -c - <<EOF
50-
10ad9e86233e74c0f6590fe5426895de6bf388964210eac34a6d83f38918ecdc /tmp/go.tgz
50+
4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3 /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-
8f7bb0bc7314580dd8c2f2c975abafb4a20350cd
1+
4eca4292cae8f25b834db7001ff25284b1f9ccfa

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

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

1111
GO_FIPS_REPO=https://github.com/golang-fips/go
12-
GO_FIPS_COMMIT=48249927ea35f749f185b659c60f308d2142bf5b
12+
GO_FIPS_COMMIT=12327118900b0833266189a293cba8ad674901c1
1313
GOCOMMIT=$(grep -v ^# /bootstrap/commit.txt | head -n1)
1414
1515
# Install build dependencies
@@ -29,7 +29,13 @@ git checkout $GO_FIPS_COMMIT
2929
# to Ubuntu 24.04. Without this removal, attempting to run the binary on our
3030
# current build infrastructure results in the following error:
3131
# version `GLIBC_2.32' not found (required by external/go_sdk_fips/bin/go)
32-
rm ./patches/001-fix-linkage.patch
32+
rm ./patches/017-fix-linkage.patch
33+
# This patch doesn't apply on Go 1.23.6, but all the files are test-only, so
34+
# they shouldn't make a difference for the purpose of building the SDK.
35+
# When golang-fips supports Go 1.23.6, this line can be deleted.
36+
rm ./patches/023-crypto-tls-fix-config-time.patch
37+
# Lower the requirements in case we need to bootstrap with an older Go version
38+
sed -i "s/go mod tidy/go mod tidy -go=1.16/g" scripts/create-secondary-patch.sh
3339
GOLANG_REPO=https://github.com/cockroachdb/go.git ./scripts/full-initialize-repo.sh "$GOCOMMIT"
3440
cd go/src
3541
# add a special version modifier so we can explicitly use it in bazel

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.24.5
12+
GOVERS=1.23.7
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=10ad9e86233e74c0f6590fe5426895de6bf388964210eac34a6d83f38918ecdc
17+
LINUXSHASUM=4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3
1818
1919
apt-get update
2020
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)