Start adapting to bzlmod configurations. #3505
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
github-actions
bot
added
the
explorer
jonmeow
force-pushed
the
bzlmod
branch
2 times, most recently
from
78f3f90
to
b7aa3e1
Compare
jonmeow
force-pushed
the
bzlmod
branch
4 times, most recently
from
0ad8ef8
to
1fb9a71
Compare
zygoloid
approved these changes
Dec 14, 2023
| deps_path = ( | ||
| runfiles / "carbon" / "bazel" / "check_deps" / "non_test_cc_deps.txt" | ||
| ) | ||
| deps_path = runfiles / "_main" / "bazel" / "check_deps" / "non_test_cc_deps.txt" |
There was a problem hiding this comment.
Should we also remove the bazel-execroot symlink, or update it to point to _main?
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 18, 2023
Building on #3505, the toolchain and llvm rules require a little more special-casing to get them to work well. This also moves libprotobuffer_mutator, but that one's more minor. The migration encounters more quirks in repo naming as seen by various queries. This changes some of the toolchain work that was recently done for bazel 7 in #3496, dropping a bzl file I'd suggested to add, instead using `:all` for toolchain registration. (somewhat as an improvement, somewhat just to avoid a `load`) Remaining in the WORKSPACE are example code repos and tree sitter rules. Neither of these are part of the main toolchain builds, and so will probably be lower impact if there's a good solution for them.
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.
Some background information is at https://bazel.build/external/migration
Trying to handle the simple cases first. This adds a requirement for bazel 7 due to differences in bzlmod handling between 6 and 7 (also discussed on #infra). Bazel seems to be okay with a partial migration such as ths.
The python import behavior has subtly shifted, so
carbon.is no longer part of import paths. There's a version-incompatible change for@@. bzlmod makes repos sometimes show asname~version.target-determinatorseems to be okay with@@after a version update.Things not moved here are things that basically need more dep work: