[7.1.0] Fix fetch target (fixes #13847) #21527
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
Context: - Traditional query relies on the initial loading phase of the build, this lacks the context of build configurations (flags, select() logic), leading to potentially inaccurate or over-inclusive dependency listings. - cquery executes after the analysis phase, where Bazel has resolved configurations and determined how options influence target definitions. This allows cquery to provide the dependencies truly needed for a build under the current settings. Considering these differences, I'm updating fetch target logic to rely on cquery instead. This ensures that all necessary repositories are fetched for an offline build while avoiding potential over-fetching PiperOrigin-RevId: 611455579 Change-Id: I2a954476c06182fd9eb78ad86def7bd72f04074a # Conflicts: # src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java
github-actions
bot
added
awaiting-review
This CL adds aspect nodes as explicit targets in cquery deps by making ConfiguredTargetQueryEnvironment generic over a new interface, CqueryNode, rather than ConfiguredTarget. CqueryNode is implemented by AspectKey as well as ConfiguredTarget so that both can be traversed in a deps query. PiperOrigin-RevId: 595509373 Change-Id: I8a637cd3ed640907d2b1501bcd2b4a4507d183e7 # Conflicts: # src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQueryEnvironment.java # src/main/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallback.java # src/main/java/com/google/devtools/build/lib/rules/BUILD
This annotation is orthogonal to AutoCodec and creates a circular dependency in a later change. PiperOrigin-RevId: 579867965 Change-Id: Iff7ab004d7635c32edb9de38231b2d4c93469c6f # Conflicts: # src/main/java/com/google/devtools/build/lib/rules/BUILD # src/main/java/com/google/devtools/build/lib/skyframe/TestCompletionValue.java
…nto add-fetch-fix
|
@SalmaSamy Looks like the tests are failing. Could you please take a look? cc: @bazelbuild/triage |
|
Salma is OOO, I'll take a look today |
|
Closing due to #21567 |
auto-merge was automatically disabled
March 5, 2024 10:51
Pull request was closed
github-actions
bot
removed
the
awaiting-review
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.
Context:
Traditional query relies on the initial loading phase of the build, this lacks the context of build configurations (flags, select() logic), leading to potentially inaccurate or over-inclusive dependency listings.
cquery executes after the analysis phase, where Bazel has resolved configurations and determined how options influence target definitions. This allows cquery to provide the dependencies truly needed for a build under the current settings.
Considering these differences, I'm updating fetch target logic to rely on cquery instead. This ensures that all necessary repositories are fetched for an offline build while avoiding potential over-fetching
PiperOrigin-RevId: 611455579
Change-Id: I2a954476c06182fd9eb78ad86def7bd72f04074a
Cherry-picking commit & commit was needed.