Make bazel mod tidy work with include()
#22455
Closed
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
Wyverald
added
team-ExternalDeps
|
Tests will fail until a new buildozer release (with bazelbuild/buildtools@1429e15). Tested locally with a patched buildozer and it passes. |
fmeum
approved these changes
May 20, 2024
| rootUsage.getProxies().stream().filter(p -> !p.isDevDependency()).findFirst().get(); | ||
| moduleFilePathToCommandsBuilder.put( | ||
| firstNonDevProxy.getContainingModuleFilePath(), | ||
| makeUseRepoCommand("use_repo_add", firstNonDevProxy.getProxyName(), importsToAdd)); |
There was a problem hiding this comment.
What happens here if the proxy is not exported? I agree we don't need to support this case, but how bad is the failure?
There was a problem hiding this comment.
the proxy name would be the empty string, resulting in commands like use_repo_add repo1 repo2, which means repo1 would be interpreted as the exported name...
I changed it so that unexported proxies would be treated as if they're exported as _unnamed_usage. Will probably tip people off that these are supposed to be named.
src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionMetadata.java
Show resolved
Hide resolved
fmeum
approved these changes
May 20, 2024
We now generate fixup commands targeting `include()`d segments in addition to the root MODULE.bazel file itself. Fixup commands are grouped by file, and then passed to Buildozer using `-f -` (i.e. multiple commands for multiple files, passed in using stdin). - For repos to add, we find the first usage with the correct prod/dev type and add them there. - For repos to remove, we remove them from whichever usage had them. - At the end, all module files and included segments are formatted. Fixes #22063
Wyverald
force-pushed
the
wyv-include-tidy
branch
from
2e8cc8f
to
31b9db9
Compare
github-actions
bot
removed
the
awaiting-review
bazel-io
pushed a commit
to bazel-io/bazel
that referenced
this pull request
May 23, 2024
We now generate fixup commands targeting `include()`d segments in addition to the root MODULE.bazel file itself. Fixup commands are grouped by file, and then passed to Buildozer using `-f -` (i.e. multiple commands for multiple files, passed in using stdin). - For repos to add, we find the first usage with the correct prod/dev type and add them there. - For repos to remove, we remove them from whichever usage had them. - At the end, all module files and included segments are formatted. Fixes bazelbuild#22063 Closes bazelbuild#22455. PiperOrigin-RevId: 636680730 Change-Id: Id894a449d8d1cdf39271ea3a724a91aebc51befb
Wyverald
added a commit
that referenced
this pull request
May 24, 2024
We now generate fixup commands targeting `include()`d segments in addition to the root MODULE.bazel file itself. Fixup commands are grouped by file, and then passed to Buildozer using `-f -` (i.e. multiple commands for multiple files, passed in using stdin). - For repos to add, we find the first usage with the correct prod/dev type and add them there. - For repos to remove, we remove them from whichever usage had them. - At the end, all module files and included segments are formatted. Fixes #22063 Closes #22455. PiperOrigin-RevId: 636680730 Change-Id: Id894a449d8d1cdf39271ea3a724a91aebc51befb
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 24, 2024
We now generate fixup commands targeting `include()`d segments in addition to the root MODULE.bazel file itself. Fixup commands are grouped by file, and then passed to Buildozer using `-f -` (i.e. multiple commands for multiple files, passed in using stdin). - For repos to add, we find the first usage with the correct prod/dev type and add them there. - For repos to remove, we remove them from whichever usage had them. - At the end, all module files and included segments are formatted. Fixes #22063 Closes #22455. PiperOrigin-RevId: 636680730 Change-Id: Id894a449d8d1cdf39271ea3a724a91aebc51befb
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.
We now generate fixup commands targeting
include()d segments in addition to the root MODULE.bazel file itself. Fixup commands are grouped by file, and then passed to Buildozer using-f -(i.e. multiple commands for multiple files, passed in using stdin).Fixes #22063