diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16cdaa4..5efff76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,15 +13,12 @@ jobs: strategy: matrix: swift-version: ["6.1", "6.2"] + container: + image: swift:${{ matrix.swift-version }} steps: - name: Checkout code uses: actions/checkout@v4 - - name: Setup Swift ${{ matrix.swift-version }} - uses: swift-actions/setup-swift@v3 - with: - swift-version: ${{ matrix.swift-version }} - - name: Cache Swift packages uses: actions/cache@v4 with: @@ -48,7 +45,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Swift ${{ matrix.swift-version }} - uses: swift-actions/setup-swift@v3 + uses: swift-actions/setup-swift@v2 with: swift-version: ${{ matrix.swift-version }} diff --git a/.github/workflows/release-tailwindcss-cli.yml b/.github/workflows/release-tailwindcss-cli.yml index f273eb3..130cee9 100644 --- a/.github/workflows/release-tailwindcss-cli.yml +++ b/.github/workflows/release-tailwindcss-cli.yml @@ -20,9 +20,9 @@ jobs: uses: actions/checkout@v4 - name: Setup Swift - uses: swift-actions/setup-swift@v3 + uses: swift-actions/setup-swift@v2 with: - swift-version: "6.2" + swift-version: "6.1" - name: Cache Swift packages uses: actions/cache@v4 diff --git a/Package.resolved b/Package.resolved index 97ab3f8..e8c11be 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "7c7cefeea2d5b6b41e4e4c63355216005204668d5b71b766db2eaeb0414dc0b8", + "originHash" : "8e39da950f9cbe4c8126b1fabf0d3d6945ab547f7564fd7bb0921701f3269c14", "pins" : [ { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615", - "version" : "1.7.0" + "revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3", + "version" : "1.6.1" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-asn1.git", "state" : { - "revision" : "810496cf121e525d660cd0ea89a758740476b85f", - "version" : "1.5.1" + "revision" : "f70225981241859eb4aa1a18a75531d26637c8cc", + "version" : "1.4.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-crypto.git", "state" : { - "revision" : "6f70fa9eab24c1fd982af18c281c4525d05e3095", - "version" : "4.2.0" + "revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc", + "version" : "3.15.1" } } ], diff --git a/Package.swift b/Package.swift index 0297c30..ea0e1a8 100644 --- a/Package.swift +++ b/Package.swift @@ -10,8 +10,8 @@ let package = Package( .executable(name: "TailwindCSSCLIArtifactBundler", targets: ["TailwindCSSCLIArtifactBundler"]), ], dependencies: [ - .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.7.0"), - .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0"..<"5.0.0"), + .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"), ], targets: [ .executableTarget( diff --git a/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift b/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift index ac45cd4..19f43fd 100644 --- a/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift +++ b/Sources/TailwindCSSCLIArtifactBundler/ArtifactBundleBuilder+File Operations.swift @@ -22,11 +22,13 @@ extension ArtifactBundleBuilder { } let bundleDirURL = URL(fileURLWithPath: bundleDir) + let workDirURL = bundleDirURL.deletingLastPathComponent() let bundleName = bundleDirURL.lastPathComponent let process = Process() process.executableURL = URL(fileURLWithPath: "/usr/bin/zip") process.arguments = ["-r", zipPath, bundleName] + process.currentDirectoryURL = workDirURL try process.run() process.waitUntilExit()