Merge #132776

132776: build: Revert "build: upgrade to Go 1.23.2" r=dt a=rickystewart This reverts commit 310e53a. Closes #132601. Epic: none Release note: None Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Oct 16, 2024 · cbead84 · cbead84
2 parents a8b5f6c + 86189a0
commit cbead84
Show file tree

Hide file tree

Showing 102 changed files with 713 additions and 1,513 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -26,16 +26,18 @@ build --flag_alias=cross=//build/toolchains:cross_flag
 build --flag_alias=dev=//build/toolchains:dev_flag
 build --flag_alias=force_build_cdeps=//build/toolchains:force_build_cdeps_flag
 build --flag_alias=heavy=//build/toolchains:heavy_flag
+build --flag_alias=lintonbuild=//build/toolchains:nogo_flag
+build --flag_alias=nolintonbuild=//build/toolchains:nonogo_explicit_flag
 
 build:crdb_test_off --crdb_test_off
 build:cross --cross
 build:dev --dev
 build:force_build_cdeps --force_build_cdeps
 build:heavy --heavy
-build:lintonbuild --run_validations
-build:nolintonbuild --norun_validations
+build:lintonbuild --lintonbuild
+build:nolintonbuild --nolintonbuild
 # Note: nonogo is classically the name of the nolintonbuild configuration.
-build:nonogo --config nolintonbuild
+build:nonogo --nolintonbuild
 build:test --crdb_test
 
 # Basic settings.
@@ -63,7 +65,7 @@ test:race --heavy
 # CI uses a custom timeout for enormous targets.
 test:use_ci_timeouts --test_timeout=60,300,900,900
 # CI should always run with `--config=ci`.
-build:cibase --config=lintonbuild
+build:cibase --lintonbuild
 # Set `-test.v` in Go tests.
 # Ref: https://github.com/bazelbuild/rules_go/pull/2456
 test:cibase --test_env=GO_TEST_WRAP_TESTV=1
@@ -89,7 +91,7 @@ build:crosslinuxfips '--workspace_status_command=./build/bazelutil/stamp.sh x86_
 build:crosslinuxfips --config=crosslinuxfipsbase
 build:crosslinuxfipsbase --platforms=//build/toolchains:cross_linux
 build:crosslinuxfipsbase --config=cross
-build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.23.2fips
+build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.22.5fips
 build:crosswindows '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32'
 build:crosswindows --config=crosswindowsbase
 build:crosswindowsbase --platforms=//build/toolchains:cross_windows

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -152,58 +152,61 @@ nogo(
     name = "crdb_nogo",
     config = "//build/bazelutil:nogo_config.json",
     visibility = ["//visibility:public"],
-    deps = [
-        "@org_golang_x_tools//go/analysis/passes/asmdecl:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/assign:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/atomic:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/atomicalign:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/bools:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/buildssa:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/buildtag:go_default_library",
-        # TODO(rules_go#2396): pass raw cgo sources to cgocall and re-enable.
-        # "@org_golang_x_tools//go/analysis/passes/cgocall:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/composite:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/copylock:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/ctrlflow:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/errorsas:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/findcall:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/httpresponse:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/ifaceassert:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/inspect:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/lostcancel:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/nilfunc:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/nilness:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/pkgfact:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/printf:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/shift:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/sortslice:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/stdmethods:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/stringintconv:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/structtag:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/testinggoroutine:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/tests:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/unmarshal:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/unreachable:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/unsafeptr:go_default_library",
-        "@org_golang_x_tools//go/analysis/passes/unusedresult:go_default_library",
-        "//pkg/testutils/lint/passes/deferunlockcheck",
-        "//pkg/testutils/lint/passes/descriptormarshal",
-        "//pkg/testutils/lint/passes/errcheck",
-        "//pkg/testutils/lint/passes/errcmp",
-        "//pkg/testutils/lint/passes/errwrap",
-        "//pkg/testutils/lint/passes/fmtsafe",
-        "//pkg/testutils/lint/passes/grpcclientconnclose",
-        "//pkg/testutils/lint/passes/grpcstatuswithdetails",
-        "//pkg/testutils/lint/passes/hash",
-        "//pkg/testutils/lint/passes/leaktestcall",
-        "//pkg/testutils/lint/passes/nilness",
-        "//pkg/testutils/lint/passes/nocopy",
-        "//pkg/testutils/lint/passes/redactcheck",
-        "//pkg/testutils/lint/passes/returncheck",
-        "//pkg/testutils/lint/passes/returnerrcheck",
-        "//pkg/testutils/lint/passes/shadow",
-        "//pkg/testutils/lint/passes/timer",
-        "//pkg/testutils/lint/passes/unconvert",
-    ] + STATICCHECK_CHECKS,
+    deps = select({
+        "//build/toolchains:nogo": [
+            "@org_golang_x_tools//go/analysis/passes/asmdecl:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/assign:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/atomic:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/atomicalign:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/bools:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/buildssa:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/buildtag:go_default_library",
+            # TODO(rules_go#2396): pass raw cgo sources to cgocall and re-enable.
+            # "@org_golang_x_tools//go/analysis/passes/cgocall:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/composite:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/copylock:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/ctrlflow:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/deepequalerrors:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/errorsas:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/findcall:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/httpresponse:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/ifaceassert:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/inspect:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/lostcancel:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/nilfunc:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/nilness:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/pkgfact:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/printf:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/shift:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/sortslice:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/stdmethods:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/stringintconv:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/structtag:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/testinggoroutine:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/tests:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/unmarshal:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/unreachable:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/unsafeptr:go_default_library",
+            "@org_golang_x_tools//go/analysis/passes/unusedresult:go_default_library",
+            "//pkg/testutils/lint/passes/deferunlockcheck",
+            "//pkg/testutils/lint/passes/descriptormarshal",
+            "//pkg/testutils/lint/passes/errcheck",
+            "//pkg/testutils/lint/passes/errcmp",
+            "//pkg/testutils/lint/passes/errwrap",
+            "//pkg/testutils/lint/passes/fmtsafe",
+            "//pkg/testutils/lint/passes/grpcclientconnclose",
+            "//pkg/testutils/lint/passes/grpcstatuswithdetails",
+            "//pkg/testutils/lint/passes/hash",
+            "//pkg/testutils/lint/passes/leaktestcall",
+            "//pkg/testutils/lint/passes/nilness",
+            "//pkg/testutils/lint/passes/nocopy",
+            "//pkg/testutils/lint/passes/redactcheck",
+            "//pkg/testutils/lint/passes/returncheck",
+            "//pkg/testutils/lint/passes/returnerrcheck",
+            "//pkg/testutils/lint/passes/shadow",
+            "//pkg/testutils/lint/passes/timer",
+            "//pkg/testutils/lint/passes/unconvert",
+        ] + STATICCHECK_CHECKS,
+        "//conditions:default": [],
+    }),
 )