Skip to content

Commit 076fbc7

Browse files
authored
build(bazelci): explicitly enable workspace where Bzlmod is disabled (#2184)
Only do this for latest Bazel (--enable_workspace was only introduced in 7.1.0). Fixes #2175
1 parent 7b99948 commit 076fbc7

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,18 @@ buildifier:
3838
- "..."
3939
test_flags:
4040
- "--test_tag_filters=-integration-test"
41+
.common_workspace_flags_min_bazel: &common_workspace_flags_min_bazel
42+
test_flags:
43+
- "--noenable_bzlmod"
44+
build_flags:
45+
- "--noenable_bzlmod"
4146
.common_workspace_flags: &common_workspace_flags
4247
test_flags:
4348
- "--noenable_bzlmod"
49+
- "--enable_workspace"
4450
build_flags:
4551
- "--noenable_bzlmod"
52+
- "--enable_workspace"
4653
.common_bazelinbazel_config: &common_bazelinbazel_config
4754
build_flags:
4855
- "--build_tag_filters=integration-test"
@@ -84,7 +91,7 @@ buildifier:
8491
- "--test_tag_filters=-integration-test,-doc_check_test"
8592
tasks:
8693
gazelle_extension_min:
87-
<<: *common_workspace_flags
94+
<<: *common_workspace_flags_min_bazel
8895
<<: *minimum_supported_version
8996
name: "Gazelle: workspace, minumum supported Bazel version"
9097
platform: ubuntu2004
@@ -108,7 +115,7 @@ tasks:
108115
ubuntu_min_workspace:
109116
<<: *minimum_supported_version
110117
<<: *reusable_config
111-
<<: *common_workspace_flags
118+
<<: *common_workspace_flags_min_bazel
112119
name: "Default: Ubuntu, workspace, minimum Bazel"
113120
platform: ubuntu2004
114121
ubuntu_min_bzlmod:
@@ -187,7 +194,7 @@ tasks:
187194
integration_test_build_file_generation_ubuntu_minimum_supported_workspace:
188195
<<: *minimum_supported_version
189196
<<: *reusable_build_test_all
190-
<<: *common_workspace_flags
197+
<<: *common_workspace_flags_min_bazel
191198
name: "examples/build_file_generation: Ubuntu, workspace, minimum Bazel"
192199
working_directory: examples/build_file_generation
193200
platform: ubuntu2004
@@ -325,7 +332,7 @@ tasks:
325332

326333
integration_test_pip_parse_ubuntu_min_workspace:
327334
<<: *minimum_supported_version
328-
<<: *common_workspace_flags
335+
<<: *common_workspace_flags_min_bazel
329336
<<: *reusable_build_test_all
330337
name: "examples/pip_parse: Ubuntu, workspace, minimum supporte Bazel version"
331338
working_directory: examples/pip_parse
@@ -359,7 +366,7 @@ tasks:
359366

360367
integration_test_pip_parse_vendored_ubuntu_min_workspace:
361368
<<: *minimum_supported_version
362-
<<: *common_workspace_flags
369+
<<: *common_workspace_flags_min_bazel
363370
<<: *reusable_build_test_all
364371
name: "examples/pip_parse_vendored: Ubuntu, workspace, minimum Bazel"
365372
working_directory: examples/pip_parse_vendored
@@ -538,7 +545,7 @@ tasks:
538545

539546
integration_compile_pip_requirements_test_from_external_repo_ubuntu_min_workspace:
540547
<<: *minimum_supported_version
541-
<<: *common_workspace_flags
548+
<<: *common_workspace_flags_min_bazel
542549
name: "compile_pip_requirements_test_from_external_repo: Ubuntu, workspace, minimum Bazel"
543550
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
544551
platform: ubuntu2004

0 commit comments

Comments
 (0)