Fix force resolved versions for transitive local dependencies #3691
Conversation
This file contains hidden or 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
neonichu
requested review from
abertelrud,
friedbunny and
tomerd
as code owners
Previously we were pre-populating managed dependencies with only the first level of dependencies from roots. Now we will do this before attempting to load manifests to ensure this works recursively. rdar://82397606
neonichu
force-pushed
the
fix-resolved-versions-for-transitive-local-dependencies
branch
from
c983fa6 to
bba493c
Compare
|
@swift-ci please smoke test |
abertelrud
reviewed
Aug 26, 2021
| // Save state for local packages, if any. | ||
| // | ||
| // FIXME: This will only work for top-level local packages right now. | ||
| for rootManifest in rootManifests.values { |
There was a problem hiding this comment.
So the reason this can be removed is that the dependenciesRequired above always already contain all the root manifests?
There was a problem hiding this comment.
Yep, that's right, we are already processing the direct dependencies of the roots there, no need to do it twice. The roots themselves do not end up in managed dependencies.
neonichu
deleted the
fix-resolved-versions-for-transitive-local-dependencies
branch
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.
Previously we were pre-populating managed dependencies with only the first level of dependencies from roots. Now we will do this before attempting to load manifests to ensure this works recursively.
Motivation:
Make the force resolved versions mode work for cases where local dependencies are used in packages other than the roots.
Modifications:
_resolveToResolvedVersionloadDependencyManifeststo enable automatically adding local packages to managed dependencies if we are in the force resolved versions modeI considered two alternative changes:
Result:
The force resolved versions mode works for cases where local dependencies are used in packages other than the roots.