Skip to content

Commit ee57fdc

Browse files
authored
Revert "Pin to bazel 8.4.2 (#3804)" (#3867)
This change un-restricts the Bazel version which today means we will be testing against Bazel 9
1 parent dc9ca99 commit ee57fdc

File tree

224 files changed

+3937
-7083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+3937
-7083
lines changed

.bazelci/presubmit.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -964,12 +964,6 @@ tasks:
964964
working_directory: examples/proto
965965
build_targets:
966966
- "//..."
967-
bzlmod_protoc:
968-
name: Proto and Prost with prebuilt protoc with bzlmod
969-
platform: ubuntu2204
970-
working_directory: examples/proto_with_toolchain
971-
build_targets:
972-
- "//..."
973967
compile_one_dependency:
974968
name: --compile_one_dependency flag
975969
platform: ubuntu2204

.bazelversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

.bcr/extensions/bindgen/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ bcr_test_module:
66
- "ubuntu2004"
77
# # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
88
# - "windows"
9-
bazel: ["7.x", "8.x"]
9+
bazel: ["7.x", "8.x", "9.x"]
1010
tasks:
1111
run_tests:
1212
name: "Run test module"

.bcr/extensions/mdbook/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: ""
33
matrix:
44
platform: ["macos_arm64", "ubuntu2004", "windows"]
5-
bazel: ["7.x", "8.x"]
5+
bazel: ["7.x", "8.x", "9.x"]
66
tasks:
77
run_tests:
88
name: "Run test module"

.bcr/extensions/prost/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: ""
33
matrix:
44
platform: ["macos_arm64", "ubuntu2004", "windows"]
5-
bazel: ["7.x", "8.x"]
5+
bazel: ["7.x", "8.x", "9.x"]
66
tasks:
77
run_tests:
88
name: "Run test module"

.bcr/extensions/pyo3/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: ""
33
matrix:
44
platform: ["macos_arm64", "ubuntu2004", "windows"]
5-
bazel: ["7.x", "8.x"]
5+
bazel: ["7.x", "8.x", "9.x"]
66
tasks:
77
run_tests:
88
name: "Run test module"

.bcr/extensions/wasm_bindgen/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: ""
33
matrix:
44
platform: ["ubuntu2004", "windows"]
5-
bazel: ["7.x", "8.x"]
5+
bazel: ["7.x", "8.x", "9.x"]
66
tasks:
77
run_tests:
88
name: "Run test module"
@@ -16,7 +16,7 @@ bcr_test_module_macos:
1616
module_path: ""
1717
matrix:
1818
platform: ["macos_arm64"]
19-
bazel: ["7.x", "8.x"]
19+
bazel: ["7.x", "8.x", "9.x"]
2020
tasks:
2121
run_tests:
2222
name: "Run test module"

.bcr/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: ""
33
matrix:
44
platform: ["macos_arm64", "ubuntu2004"]
5-
bazel: ["7.x", "8.x"]
5+
bazel: ["7.x", "8.x", "9.x"]
66
tasks:
77
run_tests:
88
working_directory: examples/hello_world
@@ -21,7 +21,7 @@ bcr_test_module:
2121
bcr_test_module_windows:
2222
module_path: ""
2323
matrix:
24-
bazel: ["7.x", "8.x"]
24+
bazel: ["7.x", "8.x", "9.x"]
2525
tasks:
2626
run_tests:
2727
working_directory: examples/hello_world

cargo/tests/cargo_build_script/tools_exec/tools_exec.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
pub fn test_tool_exec() {
33
let tool_path = env!("TOOL_PATH");
44
assert!(
5-
tool_path.contains("-exec-"),
6-
"tool_path did not contain '-exec-'",
5+
tool_path.contains("-exec-") || tool_path.contains("-exec/bin/"),
6+
"tool_path did not contain '-exec-' or '-exec/bin'\n`{}`",
7+
tool_path,
78
);
89
}

cargo/tests/unit/build_script_deps/build_script_deps.bzl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ def _build_script_deps_test_impl(ctx):
4242
if output.path.endswith(".rlib")
4343
][0]
4444

45-
asserts.true(env, "-exec-" in rlib_output.path)
45+
asserts.true(
46+
env,
47+
("-exec-" in rlib_output.path) or ("-exec/bin/" in rlib_output.path),
48+
"Expected rlib output to be in an exec configuration, but got: {}".format(rlib_output.path),
49+
)
4650
return analysistest.end(env)
4751

4852
build_script_deps_test = analysistest.make(

0 commit comments

Comments
 (0)