Fix swift-metrics unzipping #27
Merged
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
finestructure
commented
Jun 27, 2024
| @@ -40,7 +40,7 @@ let package = Package( | |||
| .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "0.1.0"), | |||
| .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.1"), | |||
| .package(url: "https://github.com/soto-project/soto-s3-file-transfer.git", from: "1.2.0"), | |||
| .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.19"), | |||
| .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"), | |||
There was a problem hiding this comment.
We can't use ZIPFoundation, because it doesn't actually zip directories recursively. Best I can tell there's no way to do it other than by listing all the files ourselves. marmelroy/Zip supports that, so it's easier to stick with it for now.
finestructure
commented
Jun 27, 2024
| let unzip = URL(fileURLWithPath: "/usr/bin/unzip") | ||
| let process = try Process.run(unzip, arguments: ["-q", inputPath.path, "-d", outputPath.path]) | ||
| process.waitUntilExit() | ||
| } |
There was a problem hiding this comment.
I've verified that /usr/bin/unzip is available at that path on the amazon linux image.
daveverwer
approved these changes
Jun 27, 2024
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.
Fixes SwiftPackageIndex/SwiftPackageIndex-Server#3137
The issues are as follows:
uploadingstage SwiftPackageIndex-Server#3069)The easiest way to deal with this mess is to simply keep using marmelroy/Zip but fall back to os level unzip when it fails.