tmp

.bazelignore

@@ -10,6 +10,5 @@ pkg/ui/workspaces/db-console/src/js/node_modules
 pkg/ui/workspaces/db-console/ccl/src/js/node_modules
 pkg/ui/workspaces/e2e-tests/node_modules
 pkg/ui/workspaces/eslint-plugin-crdb/node_modules
-pkg/ui/workspaces/crdb-api-client/node_modules
 tmp
 vendor

.bazelrc

@@ -9,38 +9,30 @@
 # Note that .bazelrc.user should be in your checkout (next to this file), not
 # your home directory.
 
-# Ignore warnings about using a source directory as an input file. This is
-# evidently a bug in rules_js that they haven't fixed yet. It seems it's
-# "mostly" fixed except for packages that have patches or lifecycle hooks.
-# Unfortunately that's many of the packages we use, so builds will be very
-# noisy without this. See aspect-build/rules_js#1408. When the upstream issue
-# is fixed, this should be removed.
-startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
+build --enable_platform_specific_config
 
 # Define a set up flag aliases, so people can use `--cross` instead of the
 # longer `//build/toolchains:cross_flag`.
-build --flag_alias=bazel_code_coverage=//build/toolchains:bazel_code_coverage_flag
 build --flag_alias=crdb_test=//build/toolchains:crdb_test_flag
 build --flag_alias=crdb_test_off=//build/toolchains:crdb_test_off_flag
 build --flag_alias=cross=//build/toolchains:cross_flag
 build --flag_alias=dev=//build/toolchains:dev_flag
+build --flag_alias=bazel_code_coverage=//build/toolchains:bazel_code_coverage_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.
-common --noenable_bzlmod
-build --enable_platform_specific_config
 build --define gotags=bazel,gss
 build --experimental_proto_descriptor_sets_include_source_info
 build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
@@ -53,17 +45,16 @@ query --ui_event_filters=-DEBUG
 clean --ui_event_filters=-WARNING
 info --ui_event_filters=-WARNING
 
-build:race --@io_bazel_rules_go//go/config:race "--test_env=GORACE=halt_on_error=1 log_path=stdout"
+build:race --@io_bazel_rules_go//go/config:race "--test_env=GORACE=halt_on_error=1 log_path=stdout" --test_sharding_strategy=disabled
 test:test --test_env=TZ=
 # Note: these timeout values are used indirectly in `build/teamcity/cockroach/ci/tests/testrace_impl.sh`.
 # If those values are updated, the script should be updated accordingly.
 test:race --test_timeout=1200,6000,18000,72000
-test:race --heavy
 
 # CI uses a custom timeout for enormous targets.
-test:use_ci_timeouts --test_timeout=60,300,900,900
+test:use_ci_timeouts --test_timeout=60,300,900,900 --define=use_ci_timeouts=true
 # 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 +80,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.22.8fips
+build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.21.12fips
 build:crosswindows '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32'
 build:crosswindows --config=crosswindowsbase
 build:crosswindowsbase --platforms=//build/toolchains:cross_windows
@@ -116,24 +107,24 @@ build:devdarwinx86_64 --config=dev
 build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
 
-build:macos --linkopt="-Xlinker"
-build:macos --linkopt="-no_warn_duplicate_libraries"
+# --config=simplestamp configures the build to stamp the build with inferred
+# information about the configuration.
+# All `dev` builds will use this configuration; all `cross` builds will use a
+# more precise --workspace_status_command option.
+build:simplestamp --stamp --workspace_status_command=./build/bazelutil/stamp.sh
 
 build:engflowbase --define=EXECUTOR=remote
 build:engflowbase --disk_cache=
 build:engflowbase --experimental_inmemory_dotd_files
 build:engflowbase --experimental_inmemory_jdeps_files
+build:engflowbase --incompatible_strict_action_env=true
 build:engflowbase --remote_timeout=600
 build:engflowbase --nolegacy_important_outputs
 build:engflowbase --grpc_keepalive_time=30s
-build:engflowbase --remote_cache_compression=true
+build:engflowbase --experimental_remote_cache_compression=true
 build:engflowbase --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 build:engflowbase --extra_execution_platforms=//build/toolchains:cross_linux
-build:engflowbase --remote_upload_local_results=false
-build:engflowbase --remote_download_toplevel
-build:engflowbase --config=cibase
 test:engflowbase --test_env=REMOTE_EXEC=1
-test:engflowbase --test_env=GOTRACEBACK=all
 build:engflow --config=engflowbase
 build:engflow --remote_cache=grpcs://tanzanite.cluster.engflow.com
 build:engflow --remote_executor=grpcs://tanzanite.cluster.engflow.com

.bazelversion

@@ -1 +1 @@
-cockroachdb/7.2.1
+cockroachdb/6.2.1

.gitattributes

@@ -1,4 +1,3 @@
 .aspect/** -diff
 build/bazelutil/distdir_files.bzl -diff
 pkg/BUILD.bazel -diff
-pkg/protos.bzl -diff