SwiftPM: Support dependency entries with a branch name #8168
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
This case wasn't covered by any test. Note: The specifying the branch name has been introduced in `PackageDescription` version 5.5, which is why the value for `swift-tools-version` is bumped. The `lockfile` has been updated by re-creating it from scratch. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
Prepare for an upcoming change. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
fviernau
force-pushed
the
support-dependencies-with-branch-names
branch
2 times, most recently
from
7788c7b
to
cdf4f2b
Compare
|
Converted to draft as it needs some further re-work. |
When analyzing a `Package.swift` file, a lockfile either already exists or gets created during execution of [1]. So, a lockfile is always present. Even though an analysis without a lockfile via [1] involves resolving revisions, the output of [1] does not contain the resolved revisions. In particular, the output of [1] has "unspecified" as version string for any dependency whose `Package.swift` entry has a branch name, not a version. Always use the resolved revisions as `VcsInfo.revision` in order to eliminate the "unspecified" version strings and to reflect the result of the resolution. This aligns with the results produced by `GoMod` which also performs a resolution during the analysis. [1] `swift package show-dependencies --fromat json` Signed-off-by: Frank Viernau <frank_viernau@epam.com>
fviernau
force-pushed
the
support-dependencies-with-branch-names
branch
from
cdf4f2b
to
ec47a8d
Compare
|
I've split out two commits to #8169. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8168 +/- ##
=========================================
Coverage 67.16% 67.16%
Complexity 2052 2052
=========================================
Files 358 358
Lines 17166 17166
Branches 2462 2462
=========================================
Hits 11530 11530
Misses 4613 4613
Partials 1023 1023
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
See individual commits.
Fixes #8167.