Skip to content

chore: enable bzlmod by default (for Bazel 6)#1632

Merged
rickeylev merged 22 commits intobazel-contrib:mainfrom
rickeylev:enable.bzlmod.default
Dec 21, 2023
Merged

chore: enable bzlmod by default (for Bazel 6)#1632
rickeylev merged 22 commits intobazel-contrib:mainfrom
rickeylev:enable.bzlmod.default

Conversation

@rickeylev
Copy link
Copy Markdown
Collaborator

@rickeylev rickeylev commented Dec 19, 2023

This enables bzlmod by default so that, by default, builds are using it for both Bazel 6
and Bazel 7.

This exposed some gaps in our test coverage, so some new jobs are created to cover
minimum bzlmod and workspace versions. Basically, our CI config used mostly
workspace builds, while Bazel's downstream testing used bzlmod builds. Changing
our config to default to bzlmod means we lost most workspace build coverage.

Unfortunately, adding these new jobs goes over the CI job limit, so I consolidated
tests a bit:

  • The py_proto_library example for bzlmod is moved under the bzlmod example. This saves
    about 6 jobs
  • Change some tests with both (Bazel 7, workspace) and (Bazel 6, workspace) to have
    just one of the two. This saves about 4 jobs. Many jobs still test both, so coverage
    should still be sufficient.

Also some various cleanups:

  • Deletes the last bazel-in-bazel integration test using our old, private, fork of
    bazel_integration_test. It hasn't been running in a long time and is broken.
  • Renames the CI jobs to have shorter names.

This enables bzlmod by default so that, by default, builds are using it
for both Bazel 6 and Bazel 7.
* Also moves non-example integration tests under tests/integration
@rickeylev rickeylev force-pushed the enable.bzlmod.default branch from 065d3a7 to 8b66bb5 Compare December 21, 2023 00:37
@rickeylev rickeylev marked this pull request as ready for review December 21, 2023 07:09
@rickeylev rickeylev requested a review from aignas December 21, 2023 07:09
@rickeylev rickeylev enabled auto-merge December 21, 2023 07:14
@rickeylev rickeylev added this pull request to the merge queue Dec 21, 2023
Merged via the queue into bazel-contrib:main with commit 67126e8 Dec 21, 2023
@rickeylev rickeylev deleted the enable.bzlmod.default branch December 21, 2023 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants