Skip to content

Switch to vapor-community/zip #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 19, 2024
Merged

Switch to vapor-community/zip #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6934de2
Switch to vapor-community/Zip exclusively
finestructure Aug 22, 2024
a28e77a
Bump Zip version
finestructure Oct 18, 2024
0904f91
Run tests on swift:6.0-amazonlinux2 as well
finestructure Oct 16, 2024
c028d9e
Skip test_issue_3069 for now
finestructure Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ on:

jobs:
tests:
strategy:
matrix:
swift: ["5.10", "6.0"]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run tests
run: docker run -v "$PWD":/host -w /host swift:5.10.0-amazonlinux2 swift test
run: docker run -v "$PWD":/host -w /host swift:${{ matrix.swift }}-amazonlinux2 swift test
15 changes: 3 additions & 12 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +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/marmelroy/Zip.git", from: "2.1.2"),
.package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.19"),
.package(url: "https://github.com/vapor-community/Zip.git", from: "2.0.0"),
.package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.0.0")
],
targets: [
Expand All @@ -58,7 +57,6 @@ let package = Package(
),
.target(name: "DocUploadBundle", dependencies: [
.product(name: "Zip", package: "Zip"),
.product(name: "ZIPFoundation", package: "zipfoundation"),
.product(name: "Dependencies", package: "swift-dependencies")
]),
.testTarget(name: "DocUploadBundleTests", dependencies: ["DocUploadBundle"], exclude: ["Fixtures"]),
Expand Down
6 changes: 1 addition & 5 deletions Sources/DocUploadBundle/Zipper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import Foundation

import Zip
import ZIPFoundation


enum Zipper {
Expand All @@ -24,10 +23,7 @@ enum Zipper {
}

static func unzip(from inputPath: URL, to outputPath: URL, fileOutputHandler: ((_ unzippedFile: URL) -> Void)? = nil) throws {
// Use ZipFoundation to unzip because of an archive that can't be round-tripped with marmelroy/Zip
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/3137
try FileManager.default.createDirectory(at: outputPath, withIntermediateDirectories: true)
try FileManager.default.unzipItem(at: inputPath, to: outputPath)
try Zip.unzipFile(inputPath, destination: outputPath, overwrite: true, password: nil, fileOutputHandler: fileOutputHandler)
}
}

Expand Down
3 changes: 3 additions & 0 deletions Tests/DocUploadBundleTests/DocUploadBundleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ final class DocUploadBundleTests: XCTestCase {

func test_issue_3069() async throws {
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/3069
// This test fails but there is a chance that the problematic zip file would not be produced anymore with recent versions. Therefore we skip this test for now.
// See https://github.com/vapor-community/Zip/issues/4#issuecomment-2308356328 for more details.
try XCTSkipIf(true)
try await withTempDir { tempDir in
let url = fixtureUrl(for: "prod-apple-swift-metrics-main-e6a00d36.zip")
XCTAssertNoThrow(
Expand Down