Skip to content

Commit b5ed3e4

Browse files
authored
tests: skip workspace-specific examples for bazel 9 (#2471)
Bazel 9 won't support workspace builds, so skip them in the Bazel@head pipeline. The bzlmod equivalents of these examples is covered elsewhere. Along the way, enable workspace by default in the examples for a bit of futureproofing. Work towards #2469
1 parent d24691f commit b5ed3e4

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.bazelci/presubmit.yml

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ buildifier:
4848
- "--noenable_bzlmod"
4949
- "--test_tag_filters=-integration-test"
5050
.common_workspace_flags: &common_workspace_flags
51+
skip_in_bazel_downstream_pipeline: "Bazel 9 doesn't support workspace"
5152
test_flags:
5253
- "--noenable_bzlmod"
5354
- "--enable_workspace"

examples/pip_repository_annotations/.bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ try-import %workspace%/user.bazelrc
33

44
# This example is WORKSPACE specific. The equivalent functionality
55
# is in examples/bzlmod as the `whl_mods` feature.
6-
build --experimental_enable_bzlmod=false
6+
build --experimental_enable_bzlmod=false --enable_workspace=true
77
common:bazel7.x --incompatible_python_disallow_native_rules

examples/py_proto_library/.bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# The equivalent bzlmod behavior is covered by examples/bzlmod/py_proto_library
2-
common --noenable_bzlmod
2+
common --noenable_bzlmod --enable_workspace=true
33
common:bazel7.x --incompatible_python_disallow_native_rules

0 commit comments

Comments
 (0)