[bazel] Enable bzlmod in hybrid mode #24781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jwnrt
force-pushed
the
hybrid-mode
branch
11 times, most recently
from
8ae38b3 to
6d30992
Compare
jwnrt
changed the title
jwnrt
force-pushed
the
hybrid-mode
branch
3 times, most recently
from
d44d639 to
2001819
Compare
engdoreis
approved these changes
Nov 15, 2024
jwnrt
force-pushed
the
hybrid-mode
branch
2 times, most recently
from
19ac6a9 to
a652a6e
Compare
Required for the python toolchain to be registered from `WORKSPACE` when using Bazel in hybrid mode. Signed-off-by: James Wainwright <[email protected]>
These are now handled by the `bazel sync` further above. They are different under bzlmod, so we remove them here. Signed-off-by: James Wainwright <[email protected]>
This commit adds a `MODULE.bazel` file and enables the bzlmod feature, but actually continues to use the existing `WORKSPACE` dependency management by moving to `WORKSPACE.bzlmod`. Dependencies can be gradually migrated from `WORKSPACE` to `MODULE.bazel`. Signed-off-by: James Wainwright <[email protected]>
Bazel seems to need these when Bzlmod is enabled. Signed-off-by: James Wainwright <[email protected]>
|
The RFC was approved, I'm going to merge |
jwnrt
added
the
CherryPick:earlgrey_1.0.0
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin earlgrey_1.0.0
git worktree add -d .worktree/backport-24781-to-earlgrey_1.0.0 origin/earlgrey_1.0.0
cd .worktree/backport-24781-to-earlgrey_1.0.0
git switch --create backport-24781-to-earlgrey_1.0.0
git cherry-pick -x 38438293e136f99deae2d13d5012b3eec792883c d29961818c5c5683e60e7312a3624471ca39b864 1035a33250c782a9b6619aaab8a5d836ceec2b41 8520242713815cda0b5cd060ea7d6c3c5a9952cf |
github-actions
bot
added
the
Manually CherryPick
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR enables Bazel's bzlmod feature in hybrid mode. Dependencies are loaded from both
WORKSPACE.bzlmodandMODULE.bazel(which is currently empty).I've had to update
rules_pythonbecause our current version doesn't work with hybrid mode (fixed in0.37.0).See #24365
After this merges, we can begin gradually moving dependencies from
WORKSPACE.bzlmodtoMODULE.bazel.