Fix symlink planting for multiple aspects #24676
Open
+10
−6
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
awaiting-review
fmeum
commented
Dec 13, 2024
| postedEventsTypes, | ||
| env, | ||
| TopLevelTargetReadyForSymlinkPlanting.create(transitivePackagesForSymlinkPlanting)); | ||
| // Don't deduplicate this event per BuildDriverKey as the transitive packages can differ |
There was a problem hiding this comment.
If the missing deduplication should turn out to be a concern, I could:
- Introduce enum constants up to some fixed number of aspects.
- Replace the inner
HashSetwith anEnumSetto potentially avoid some overhead elsewhere in this function. This may be a useful optimization on its own.
|
CI failure is likely due to #24655 (comment) |
When Skymeld is enabled, symlinks for external repositories are planted lazily in response to an event sent in `BuildDriverFunction`. For top-level aspects, this event needs to be sent individually for each aspect as the transitive packages required can differ per aspect. `BuildDriverFunction` deduplicated all events, including the one for symlink planting, by type, which resulted in missing symlinks for actions registered by the second (and later) aspects.
fmeum
force-pushed
the
24619-aspect-symlink-creation
branch
from
638cc92 to
476d90e
Compare
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.
When Skymeld is enabled, symlinks for external repositories are planted lazily in response to an event sent in
BuildDriverFunction. For top-level aspects, this event needs to be sent individually for each aspect as the transitive packages required can differ per aspect.BuildDriverFunctiondeduplicated all events, including the one for symlink planting, by type, which resulted in missing symlinks for actions registered by the second (and later) aspects.Fixes #24619