diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 9e031db331..2198260de6 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -81,6 +81,10 @@ crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets - "//vendor_remote_manifests:crates_vendor" - "//vendor_remote_pkgs:crates_vendor" - "@rules_rust//tools/rust_analyzer:gen_rust_project" +# TODO: `rules_cc` currently fails coverage invocations on Bazel 9 +# https://github.com/bazelbuild/rules_cc/issues/613 +coverage_build_flags: &coverage_build_flags + - --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1 coverage_validation_post_shell_commands: &coverage_validation_post_shell_commands - | grep -q '^SF:.*\.rs$' bazel-out/_coverage/_coverage_report.dat \ @@ -97,6 +101,7 @@ tasks: build_targets: *default_linux_targets test_targets: *default_linux_targets coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands run_targets: - //test:query_test_binary @@ -111,6 +116,7 @@ tasks: build_targets: *default_macos_targets test_targets: *default_macos_targets coverage_targets: *default_macos_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands windows: build_targets: *default_windows_targets @@ -123,6 +129,7 @@ tasks: build_targets: *default_linux_targets test_targets: *default_linux_targets coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands run_targets: - //test:query_test_binary @@ -141,6 +148,7 @@ tasks: build_targets: *default_macos_targets test_targets: *default_macos_targets coverage_targets: *default_macos_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands windows_no_bzlmod: name: No Bzlmod @@ -162,12 +170,14 @@ tasks: platform: ubuntu2204 shell_commands: *split_coverage_postprocessing_shell_commands coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands macos_split_coverage_postprocessing: name: Split Coverage Postprocessing platform: macos_arm64 shell_commands: *split_coverage_postprocessing_shell_commands coverage_targets: *default_macos_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands ubuntu2204_opt: name: Opt Mode @@ -203,6 +213,7 @@ tasks: build_targets: *default_linux_targets test_targets: *default_linux_targets coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands rbe_ubuntu2204_with_aspects: name: With Aspects @@ -231,6 +242,7 @@ tasks: build_targets: *default_macos_targets test_targets: *default_macos_targets coverage_targets: *default_macos_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands macos_rolling_with_aspects: name: "Macos Rolling Bazel Version With Aspects" @@ -239,6 +251,7 @@ tasks: build_targets: *default_macos_targets test_targets: *default_macos_targets coverage_targets: *default_macos_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands soft_fail: yes bazel: "rolling" @@ -335,6 +348,7 @@ tasks: build_targets: *default_linux_targets test_targets: *default_linux_targets coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands ubuntu1804_with_aspects: name: "Min Bazel Version With Aspects" @@ -345,6 +359,7 @@ tasks: test_targets: *default_linux_targets build_flags: *aspects_flags coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands ubuntu2204_min_rust_version: name: "Min Rust Version" @@ -411,6 +426,7 @@ tasks: build_targets: *default_linux_targets test_targets: *default_linux_targets coverage_targets: *default_linux_targets + coverage_flags: *coverage_build_flags post_shell_commands: *coverage_validation_post_shell_commands linux_docs: name: Docs diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/.bcr/extensions/bindgen/presubmit.yml b/.bcr/extensions/bindgen/presubmit.yml index c2fec5b9db..1947953306 100644 --- a/.bcr/extensions/bindgen/presubmit.yml +++ b/.bcr/extensions/bindgen/presubmit.yml @@ -6,7 +6,7 @@ bcr_test_module: - "ubuntu2004" # # TODO: https://github.com/bazelbuild/rules_rust/issues/2009 # - "windows" - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/extensions/mdbook/presubmit.yml b/.bcr/extensions/mdbook/presubmit.yml index 6618ebb522..c72382d7b0 100644 --- a/.bcr/extensions/mdbook/presubmit.yml +++ b/.bcr/extensions/mdbook/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["macos_arm64", "ubuntu2004", "windows"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/extensions/prost/presubmit.yml b/.bcr/extensions/prost/presubmit.yml index 6618ebb522..c72382d7b0 100644 --- a/.bcr/extensions/prost/presubmit.yml +++ b/.bcr/extensions/prost/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["macos_arm64", "ubuntu2004", "windows"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/extensions/protobuf/presubmit.yml b/.bcr/extensions/protobuf/presubmit.yml index 6618ebb522..c72382d7b0 100644 --- a/.bcr/extensions/protobuf/presubmit.yml +++ b/.bcr/extensions/protobuf/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["macos_arm64", "ubuntu2004", "windows"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/extensions/pyo3/presubmit.yml b/.bcr/extensions/pyo3/presubmit.yml index 6618ebb522..c72382d7b0 100644 --- a/.bcr/extensions/pyo3/presubmit.yml +++ b/.bcr/extensions/pyo3/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["macos_arm64", "ubuntu2004", "windows"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/extensions/wasm_bindgen/presubmit.yml b/.bcr/extensions/wasm_bindgen/presubmit.yml index f6d72fc793..6f524950ee 100644 --- a/.bcr/extensions/wasm_bindgen/presubmit.yml +++ b/.bcr/extensions/wasm_bindgen/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["ubuntu2004", "windows"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" @@ -16,7 +16,7 @@ bcr_test_module_macos: module_path: "" matrix: platform: ["macos_arm64"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: name: "Run test module" diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index 7388c15076..bdf1a4a245 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -2,7 +2,7 @@ bcr_test_module: module_path: "" matrix: platform: ["macos_arm64", "ubuntu2004"] - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: working_directory: examples/hello_world @@ -21,7 +21,7 @@ bcr_test_module: bcr_test_module_windows: module_path: "" matrix: - bazel: ["7.x", "8.x"] + bazel: ["7.x", "8.x", "9.x"] tasks: run_tests: working_directory: examples/hello_world diff --git a/cargo/private/cargo_build_script_runner/bin.rs b/cargo/private/cargo_build_script_runner/bin.rs index 27f5848edc..27f23b49b4 100644 --- a/cargo/private/cargo_build_script_runner/bin.rs +++ b/cargo/private/cargo_build_script_runner/bin.rs @@ -237,6 +237,19 @@ fn run_buildrs() -> Result<(), String> { .drain_runfiles_dir(&out_dir_abs) .unwrap(); } + + // If out_dir is empty add an empty file to the directory to avoid an upstream Bazel bug + // https://github.com/bazelbuild/bazel/issues/28286 + if out_dir_abs.read_dir().map(|read| read.count()).unwrap_or(1) == 0 { + std::fs::write(out_dir_abs.join(".empty"), "").unwrap_or_else(|e| { + panic!( + "Failed to write empty file to OUT_DIR `{}`\n{:?}", + out_dir_abs.display(), + e + ) + }) + } + Ok(()) } diff --git a/cargo/private/cargo_build_script_runner/cargo_manifest_dir.rs b/cargo/private/cargo_build_script_runner/cargo_manifest_dir.rs index def343a34e..744b0e2aad 100644 --- a/cargo/private/cargo_build_script_runner/cargo_manifest_dir.rs +++ b/cargo/private/cargo_build_script_runner/cargo_manifest_dir.rs @@ -273,6 +273,25 @@ impl RunfilesMaker { ) })?; } + + // If the runfiles dir is empty add an empty file to the directory to + // avoid an upstream Bazel bug https://github.com/bazelbuild/bazel/issues/28286 + if self + .output_dir + .read_dir() + .map(|read| read.count()) + .unwrap_or(1) + == 0 + { + std::fs::write(self.output_dir.join(".empty"), "").unwrap_or_else(|e| { + panic!( + "Failed to write empty file to OUT_DIR `{}`\n{:?}", + self.output_dir.display(), + e + ) + }) + } + Ok(()) } diff --git a/examples/all_crate_deps/.bazelversion b/examples/all_crate_deps/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/all_crate_deps/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/all_deps_vendor/.bazelversion b/examples/all_deps_vendor/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/all_deps_vendor/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/android/.bazelversion b/examples/android/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/android/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/android/BUILD.bazel b/examples/android/BUILD.bazel index 73137e9804..ecd9fefa7a 100644 --- a/examples/android/BUILD.bazel +++ b/examples/android/BUILD.bazel @@ -1,4 +1,4 @@ -load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library") +load("@rules_android//android:rules.bzl", "android_binary", "android_library") load("@rules_cc//cc:defs.bzl", "cc_library") load("@rules_rust//rust:defs.bzl", "rust_library") diff --git a/examples/android/MODULE.bazel b/examples/android/MODULE.bazel index 2e8c6f8e4e..7f6ed8f8e2 100644 --- a/examples/android/MODULE.bazel +++ b/examples/android/MODULE.bazel @@ -21,7 +21,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.6") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") use_repo(maven, "maven") -bazel_dep(name = "rules_android", version = "0.6.0", repo_name = "build_bazel_rules_android") +bazel_dep(name = "rules_android", version = "0.7.1") bazel_dep(name = "rules_android_ndk", version = "0.1.3") ############################################################################### diff --git a/examples/bazel_env/.bazelversion b/examples/bazel_env/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/bazel_env/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/compile_opt/.bazelversion b/examples/compile_opt/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/compile_opt/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/crate_universe/.bazelversion b/examples/crate_universe/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/crate_universe/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/crate_universe_local_path/.bazelversion b/examples/crate_universe_local_path/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/crate_universe_local_path/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/cross_compile/.bazelversion b/examples/cross_compile/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/cross_compile/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/cross_compile_llvm/.bazelversion b/examples/cross_compile_llvm/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/cross_compile_llvm/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/cross_compile_musl/.bazelversion b/examples/cross_compile_musl/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/cross_compile_musl/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/cross_compile_nix/.bazelversion b/examples/cross_compile_nix/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/cross_compile_nix/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/cross_compile_zig/.bazelversion b/examples/cross_compile_zig/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/cross_compile_zig/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/ffi/.bazelversion b/examples/ffi/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/ffi/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/hello_world/.bazelversion b/examples/hello_world/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/hello_world/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/hello_world_no_cargo/.bazelversion b/examples/hello_world_no_cargo/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/hello_world_no_cargo/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/ios/.bazelversion b/examples/ios/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/ios/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/ios/BUILD.bazel b/examples/ios/BUILD.bazel index c1ddafccd4..59e99484b3 100644 --- a/examples/ios/BUILD.bazel +++ b/examples/ios/BUILD.bazel @@ -1,5 +1,5 @@ -load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application") -load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application") +load("@rules_apple//apple:ios.bzl", "ios_application") +load("@rules_apple//apple:macos.bzl", "macos_application") load("@rules_cc//cc:defs.bzl", "cc_library", "objc_library") load("@rules_rust//rust:defs.bzl", "rust_library") @@ -62,7 +62,7 @@ platform( constraint_values = [ "@platforms//cpu:x86_64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:simulator", + "@apple_support//constraints:simulator", ], ) @@ -71,7 +71,7 @@ platform( constraint_values = [ "@platforms//cpu:arm64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:simulator", + "@apple_support//constraints:simulator", ], ) @@ -80,6 +80,6 @@ platform( constraint_values = [ "@platforms//cpu:arm64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:device", + "@apple_support//constraints:device", ], ) diff --git a/examples/ios/MODULE.bazel b/examples/ios/MODULE.bazel index 3c30740df9..a22bbf9e13 100644 --- a/examples/ios/MODULE.bazel +++ b/examples/ios/MODULE.bazel @@ -13,9 +13,9 @@ local_path_override( path = "../..", ) -bazel_dep(name = "rules_apple", version = "4.2.0", repo_name = "build_bazel_rules_apple") -bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support") -bazel_dep(name = "rules_swift", version = "3.1.2", repo_name = "build_bazel_rules_swift") +bazel_dep(name = "rules_apple", version = "4.3.3") +bazel_dep(name = "apple_support", version = "2.3.0") +bazel_dep(name = "rules_swift", version = "3.4.2") bazel_dep(name = "rules_cc", version = "0.2.4") ############################################################################### diff --git a/examples/ios_build/.bazelversion b/examples/ios_build/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/ios_build/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/ios_build/BUILD.bazel b/examples/ios_build/BUILD.bazel index cd1d97217a..1cc1e226e9 100644 --- a/examples/ios_build/BUILD.bazel +++ b/examples/ios_build/BUILD.bazel @@ -64,7 +64,7 @@ platform( constraint_values = [ "@platforms//cpu:x86_64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:simulator", + "@apple_support//constraints:simulator", ], ) @@ -73,7 +73,7 @@ platform( constraint_values = [ "@platforms//cpu:arm64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:simulator", + "@apple_support//constraints:simulator", ], ) @@ -82,6 +82,6 @@ platform( constraint_values = [ "@platforms//cpu:arm64", "@platforms//os:ios", - "@build_bazel_apple_support//constraints:device", + "@apple_support//constraints:device", ], ) diff --git a/examples/ios_build/MODULE.bazel b/examples/ios_build/MODULE.bazel index 891e015ecd..1f0fa3919f 100644 --- a/examples/ios_build/MODULE.bazel +++ b/examples/ios_build/MODULE.bazel @@ -13,9 +13,9 @@ local_path_override( path = "../..", ) -bazel_dep(name = "rules_apple", version = "4.2.0", repo_name = "build_bazel_rules_apple") -bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support") -bazel_dep(name = "rules_swift", version = "3.1.2", repo_name = "build_bazel_rules_swift") +bazel_dep(name = "rules_apple", version = "4.3.3") +bazel_dep(name = "apple_support", version = "2.3.0") +bazel_dep(name = "rules_swift", version = "3.4.2") bazel_dep(name = "rules_shell", version = "0.6.1") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "platforms", version = "1.0.0") diff --git a/examples/override_target/.bazelversion b/examples/override_target/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/override_target/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/proto/.bazelversion b/examples/proto/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/proto/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/proto_with_toolchain/.bazelversion b/examples/proto_with_toolchain/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/proto_with_toolchain/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/examples/sys/.bazelversion b/examples/sys/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/examples/sys/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/bindgen/.bazelversion b/extensions/bindgen/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/bindgen/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/mdbook/.bazelversion b/extensions/mdbook/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/mdbook/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/prost/.bazelversion b/extensions/prost/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/prost/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/protobuf/.bazelversion b/extensions/protobuf/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/protobuf/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/pyo3/.bazelversion b/extensions/pyo3/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/pyo3/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/extensions/wasm_bindgen/.bazelversion b/extensions/wasm_bindgen/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/extensions/wasm_bindgen/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/test/cargo_build_script/tools_exec/tools_exec.rs b/test/cargo_build_script/tools_exec/tools_exec.rs index b4fa401552..26dc25fee1 100644 --- a/test/cargo_build_script/tools_exec/tools_exec.rs +++ b/test/cargo_build_script/tools_exec/tools_exec.rs @@ -2,7 +2,8 @@ pub fn test_tool_exec() { let tool_path = env!("TOOL_PATH"); assert!( - tool_path.contains("-exec-"), - "tool_path did not contain '-exec-'", + tool_path.contains("-exec-") || tool_path.contains("-exec/bin/"), + "tool_path did not contain '-exec-' or '-exec/bin'\n`{}`", + tool_path, ); } diff --git a/test/integration/cc_common_link/.bazelversion b/test/integration/cc_common_link/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/test/integration/cc_common_link/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/test/integration/cc_common_link_with_global_alloc/.bazelversion b/test/integration/cc_common_link_with_global_alloc/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/test/integration/cc_common_link_with_global_alloc/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/test/integration/no_std/.bazelversion b/test/integration/no_std/.bazelversion deleted file mode 100644 index e7fdef7e2e..0000000000 --- a/test/integration/no_std/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -8.4.2 diff --git a/test/rustfmt/rustfmt_failure_tester.sh b/test/rustfmt/rustfmt_failure_tester.sh index 54755ef763..e9102bccbb 100755 --- a/test/rustfmt/rustfmt_failure_tester.sh +++ b/test/rustfmt/rustfmt_failure_tester.sh @@ -64,8 +64,6 @@ rust = use_extension("@rules_rust//rust:extensions.bzl", "rust") use_repo(rust, "rust_toolchains") register_toolchains("@rust_toolchains//:all") EOF - # See github.com/bazelbuild/rules_rust/issues/2317. - echo "build --noincompatible_sandbox_hermetic_tmp" > "${new_workspace}/.bazelrc" if [[ -f "${BUILD_WORKSPACE_DIRECTORY}/.bazelversion" ]]; then cp "${BUILD_WORKSPACE_DIRECTORY}/.bazelversion" "${new_workspace}/.bazelversion" diff --git a/test/unit/build_script_deps/build_script_deps.bzl b/test/unit/build_script_deps/build_script_deps.bzl index 2d79be4399..879cee4f80 100644 --- a/test/unit/build_script_deps/build_script_deps.bzl +++ b/test/unit/build_script_deps/build_script_deps.bzl @@ -42,7 +42,7 @@ def _build_script_deps_test_impl(ctx): if output.path.endswith(".rlib") ][0] - asserts.true(env, "-exec-" in rlib_output.path) + asserts.true(env, "-exec-" not in rlib_output.path or "-exec/bin/" not in rlib_output.path) return analysistest.end(env) build_script_deps_test = analysistest.make(