File tree Expand file tree Collapse file tree 2 files changed +2
-24
lines changed Expand file tree Collapse file tree 2 files changed +2
-24
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ buildifier:
2222.minimum_supported_version : &minimum_supported_version
2323 # For testing minimum supported version.
2424 # NOTE: Keep in sync with //:version.bzl
25- bazel : 7.4.1
25+ bazel : 7.x
2626 skip_in_bazel_downstream_pipeline : " Bazel 7 required"
2727.reusable_config : &reusable_config
2828 build_targets :
@@ -186,7 +186,6 @@ tasks:
186186 << : *reusable_config
187187 name : " RBE: Ubuntu, minimum Bazel"
188188 platform : rbe_ubuntu2004
189- bazel : 7.x
190189 build_flags :
191190 # BazelCI sets --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1,
192191 # which prevents cc toolchain autodetection from working correctly
Original file line number Diff line number Diff line change @@ -19,11 +19,8 @@ load(":integration_test.bzl", "rules_python_integration_test")
1919
2020licenses (["notice" ])
2121
22- _LEGACY_WORKSPACE_FLAGS = [
22+ _WORKSPACE_FLAGS = [
2323 "--noenable_bzlmod" ,
24- ]
25-
26- _WORKSPACE_FLAGS = _LEGACY_WORKSPACE_FLAGS + [
2724 "--enable_workspace" ,
2825]
2926
@@ -35,24 +32,6 @@ _GAZELLE_PLUGIN_FLAGS = [
3532 "--override_module=rules_python_gazelle_plugin=../../../rules_python_gazelle_plugin" ,
3633]
3734
38- default_test_runner (
39- name = "bazel_7_4_workspace_test_runner" ,
40- bazel_cmds = [
41- "info {}" .format (" " .join (_LEGACY_WORKSPACE_FLAGS )),
42- "test {} //..." .format (" " .join (_LEGACY_WORKSPACE_FLAGS )),
43- ],
44- visibility = ["//visibility:public" ],
45- )
46-
47- default_test_runner (
48- name = "bazel_7_4_workspace_test_runner_gazelle_plugin" ,
49- bazel_cmds = [
50- "info {}" .format (" " .join (_LEGACY_WORKSPACE_FLAGS + _WORKSPACE_GAZELLE_PLUGIN_FLAGS )),
51- "test {} //..." .format (" " .join (_LEGACY_WORKSPACE_FLAGS + _WORKSPACE_GAZELLE_PLUGIN_FLAGS )),
52- ],
53- visibility = ["//visibility:public" ],
54- )
55-
5635default_test_runner (
5736 name = "workspace_test_runner" ,
5837 bazel_cmds = [
You can’t perform that action at this time.
0 commit comments