Make every .bazelrc import the top level .bazelrc (#1644)

mbland · web-flow · commit 4faf94ff20ac · 2024-11-12T22:04:55.000+02:00
Makes the Bazel configuration for every test repository consistent with
the main repository.

Removes `test_version/.bazel{rc,version}`, since `test_version.sh` was
always copying the top level `.bazel{rc,version}` files into the test
repo to begin with. Updates `scripts/sync-bazelversion.sh` such that it
won't replace `test_version/.bazelversion` on future runs.

Also fixes a bug in `test/shell/test_scala_proto_library.sh` whereby it
never successfully read the top level `.bazelversion` file.
diff --git a/examples/crossbuild/.bazelrc b/examples/crossbuild/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../.bazelrc
diff --git a/examples/scala3/.bazelrc b/examples/scala3/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../.bazelrc
diff --git a/examples/semanticdb/.bazelrc b/examples/semanticdb/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../.bazelrc
diff --git a/examples/testing/multi_frameworks_toolchain/.bazelrc b/examples/testing/multi_frameworks_toolchain/.bazelrc
@@ -1,6 +1 @@
-build --enable_platform_specific_config
-windows:build --enable_runfiles
-
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../../.bazelrc
diff --git a/examples/testing/scalatest_repositories/.bazelrc b/examples/testing/scalatest_repositories/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../../.bazelrc
diff --git a/examples/testing/specs2_junit_repositories/.bazelrc b/examples/testing/specs2_junit_repositories/.bazelrc
@@ -1,6 +1 @@
-build --enable_platform_specific_config
-windows:build --enable_runfiles
-
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../../.bazelrc
diff --git a/scripts/sync-bazelversion.sh b/scripts/sync-bazelversion.sh
@@ -29,4 +29,4 @@ while IFS="" read repo_marker_path; do
   if [[ "$repo_path" != "$repo_marker_path" ]]; then
     cp .bazelversion "$repo_path"
   fi
-done < <(find [A-Za-z0-9]* \( -name "WORKSPACE*" -or -name "MODULE.bazel" \))
+done < <(find [A-Za-z0-9]* \( -name "WORKSPACE" -or -name "MODULE.bazel" \))
diff --git a/test/shell/test_scala_proto_library.sh b/test/shell/test_scala_proto_library.sh
@@ -28,7 +28,7 @@ test_scala_proto_show_generator_exception() {
     --extra_toolchains=//test/proto/custom_generator:failing_scala_proto_toolchain
 }
 
-export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat ../../../.bazelversion)}
+export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/../../.bazelversion)}
 $runner test_scala_proto_library_action_label
 $runner test_scala_proto_custom_generator
 $runner test_scala_proto_show_generator_exception
diff --git a/test_cross_build/.bazelrc b/test_cross_build/.bazelrc
@@ -1,3 +1,2 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+# Remove after moving to Bazel 7.
+import ../.bazelrc
diff --git a/test_version/.bazelrc b/test_version/.bazelrc
diff --git a/test_version/.bazelversion b/test_version/.bazelversion
diff --git a/third_party/test/example_external_workspace/.bazelrc b/third_party/test/example_external_workspace/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../../.bazelrc
diff --git a/third_party/test/proto/.bazelrc b/third_party/test/proto/.bazelrc
@@ -1,3 +1 @@
-# Remove upon completing Bzlmod compatibility work.
-# - https://github.com/bazelbuild/rules_scala/issues/1482
-build --noenable_bzlmod
+import ../../../.bazelrc

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ test_scala_proto_show_generator_exception() {`
`28`	`28`	`--extra_toolchains=//test/proto/custom_generator:failing_scala_proto_toolchain`
`29`	`29`	`}`
`30`	`30`
`31`		`-export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat ../../../.bazelversion)}`
	`31`	`+export USE_BAZEL_VERSION=${USE_BAZEL_VERSION:-$(cat $dir/../../.bazelversion)}`
`32`	`32`	`$runner test_scala_proto_library_action_label`
`33`	`33`	`$runner test_scala_proto_custom_generator`
`34`	`34`	`$runner test_scala_proto_show_generator_exception`