remove SourceArchiver #3874
Merged
remove SourceArchiver #3874
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
motivation: SourceArchiver was introduced in RegistryClient but adds a system depedency on bsdtar changes: * remove SourceArchiver * change RegistryClient to use ZipArchiver * add utility to strip first level of a directory and use that in RegistryClient * add tests
|
@swift-ci please smoke test |
tomerd
commented
Nov 18, 2021
| // TODO: consider calling `libarchive` or some other library directly instead of spawning a process | ||
| DispatchQueue.sharedConcurrent.async { | ||
| do { | ||
| let result = try Process.popen(args: "bsdtar", |
There was a problem hiding this comment.
bsdtar is a new system dependency and the reason it was introduced as explained above (see code comment) was for stripping the top level directory. this PR basically rolls back that and uses unzip which SwiftPM already relies on (and as such is already a system dependency) and handles stripping programmatically after the unzipping
tomerd
commented
Nov 18, 2021
| completion(result.mapError { error in | ||
| completion(result.tryMap { | ||
| // strip first level component | ||
| try fileSystem.stripFirstLevel(of: destinationPath) |
There was a problem hiding this comment.
@yim-lee we would need to adopt this also in the compatibility test suite and update the fixtures accordingly
|
@swift-ci please smoke test |
yim-lee
approved these changes
Nov 18, 2021
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
motivation: SourceArchiver was introduced in RegistryClient but adds a system depedency on bsdtar
changes: