Clean up .bazelrc file and improve default module file generation
PiperOrigin-RevId: 590239306
Change-Id: I8cb5dca3661c943c73dec75c346848484c2695e9
diff --git a/.bazelrc b/.bazelrc
index 6960254..0bc2e51 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -41,12 +41,11 @@
# with the target.
build:windows_arm64 --java_runtime_version=remotejdk_11
-# Enable Bzlmod
-common:bzlmod --enable_bzlmod
-common:bzlmod --check_direct_dependencies=error
-common:bzlmod --experimental_downloader_config=bazel_downloader.cfg
-common --config=bzlmod
-common --lockfile_mode=update
+# Check direct Bazel module dependencies are up-to-date
+common --check_direct_dependencies=error
+
+# Add mirrors for certain download URLs
+common --experimental_downloader_config=bazel_downloader.cfg
# Enable modern C++ features
build:linux --cxxopt=-std=c++17
diff --git a/src/test/tools/bzlmod/update_default_lock_file.sh b/src/test/tools/bzlmod/update_default_lock_file.sh
index a1afd05..70a0475 100755
--- a/src/test/tools/bzlmod/update_default_lock_file.sh
+++ b/src/test/tools/bzlmod/update_default_lock_file.sh
@@ -35,12 +35,12 @@
trap 'cleanup $tmpdir' EXIT
cd "${tmpdir}"
- touch WORKSPACE
+ touch REPO.bazel
bazel=$(rlocation io_bazel/src/bazel)
echo "Running: $bazel mod deps"
$bazel mod deps
- cp ./MODULE.bazel.lock $BUILD_WORKING_DIRECTORY/src/test/tools/bzlmod/MODULE.bazel.lock
+ cp ./MODULE.bazel.lock $BUILD_WORKSPACE_DIRECTORY/src/test/tools/bzlmod/MODULE.bazel.lock
}
generate_lock_file
diff --git a/src/test/tools/bzlmod/verify_default_lock_file.sh b/src/test/tools/bzlmod/verify_default_lock_file.sh
index 2b2fab9..546b581 100755
--- a/src/test/tools/bzlmod/verify_default_lock_file.sh
+++ b/src/test/tools/bzlmod/verify_default_lock_file.sh
@@ -30,7 +30,7 @@
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }
function test_verify_lock_file() {
- touch WORKSPACE
+ touch REPO.bazel
rm -f MODULE.bazel
cp $(rlocation io_bazel/src/test/tools/bzlmod/MODULE.bazel.lock) MODULE.bazel.lock
echo "Running: bazel mod deps --lockfile_mode=error" >& "$TEST_log"
