Skip to content

Bring testing for bzlmod vs. non-bzlmod up to date with bazel features #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyaiuto merged 1 commit into from
Feb 22, 2026
+16 −37
Merged

Bring testing for bzlmod vs. non-bzlmod up to date with bazel features #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .bazelci/examples_naming.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,3 @@ tasks:
windows:
platform: windows
<<: *common
bzlmod:
name: bzlmod
platform: ubuntu2204
build_flags:
- "--enable_bzlmod"
<<: *common
40 changes: 12 additions & 28 deletions .bazelci/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
common: &common
working_directory: ..

bzlmod: &bzlmod
build_flags:
- "--enable_bzlmod"

nobzlmod: &nobzlmod
build_flags:
- "--noenable_bzlmod"
Expand Down Expand Up @@ -85,23 +81,15 @@ windows: &windows
# Finally, the cross product of bazel releases X platforms
#
tasks:
ub_head_bzlmod:
name: ub_head_bzlmod
bazel: latest
<<: *ubuntu
<<: *bzlmod

ub_head_nobzlmod:
name: ub_head_nobzlmod
ub_head:
name: ub_head
bazel: latest
<<: *ubuntu
<<: *nobzlmod

ub_lts_bzlmod:
name: ub_lts_bzlmod
ub_lts:
name: ub_lts
bazel: latest
<<: *ubuntu
<<: *bzlmod

ub_lts_nobzlmod:
name: ub_lts_nobzlmod
Expand All @@ -120,35 +108,31 @@ tasks:
bazel: latest
<<: *centos

mac_head_bzlmod:
name: mac_head_bzlmod
mac_head:
name: mac_head
bazel: latest
<<: *macos
<<: *bzlmod

mac_lts_bzlmod:
name: mac_lts_bzlmod
mac_lts:
name: mac_lts
bazel: latest
<<: *macos
<<: *bzlmod

mac_lts_nobzlmod:
name: mac_lts_nobzlmod
bazel: latest
<<: *macos
<<: *nobzlmod

win_head_bzlmod:
name: win_head_bzlmod
win_head:
name: win_head
bazel: latest
<<: *windows
<<: *bzlmod

win_lts_bzlmod:
name: win_lts_bzlmod
win_lts:
name: win_lts
bazel: latest
<<: *windows
<<: *bzlmod

win_lts_nobzlmod:
name: win_lts_nobzlmod
Expand Down
7 changes: 4 additions & 3 deletions distro/packaging_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ def CopyTestFile(source_name, dest_name):
def _select_bazel_supported_setup(self):
output = subprocess.check_output(['bazel', 'version'], text=True)
major_version = re.search(r'Build label:\s+(\d+)', output)
if major_version and int(major_version.group(1)) >= 9:
return 'MODULE.bazel', self._module_bazel_lines, []
return 'WORKSPACE', self._workspace_lines, ['--enable_workspace']
# Module support was not the default at 7
if major_version and int(major_version.group(1)) <= 7:
return 'WORKSPACE', self._workspace_lines, ['--enable_workspace']
return 'MODULE.bazel', self._module_bazel_lines, []

def _module_bazel_lines(self, local_path, sha256):
return (
Expand Down