Compare commits

..

3 commits

Author SHA1 Message Date
b2f310dd20 fix: Bump Swift setup to v3 and fix zip invocation
Some checks are pending
CI / Test on Linux (push) Waiting to run
CI / Test on Linux-1 (push) Waiting to run
CI / Test on macOS (push) Waiting to run
CI / Test on macOS-1 (push) Waiting to run
2026-01-20 21:51:56 +08:00
01dbb546de fix: Use setup-swift@v3 in CI workflow 2026-01-20 21:37:26 +08:00
fe2fd639b0 chore: bump deps. 2026-01-20 21:29:17 +08:00
5 changed files with 17 additions and 16 deletions

View file

@ -13,12 +13,15 @@ jobs:
strategy: strategy:
matrix: matrix:
swift-version: ["6.1", "6.2"] swift-version: ["6.1", "6.2"]
container:
image: swift:${{ matrix.swift-version }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 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 - name: Cache Swift packages
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@ -45,7 +48,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Swift ${{ matrix.swift-version }} - name: Setup Swift ${{ matrix.swift-version }}
uses: swift-actions/setup-swift@v2 uses: swift-actions/setup-swift@v3
with: with:
swift-version: ${{ matrix.swift-version }} swift-version: ${{ matrix.swift-version }}

View file

@ -20,9 +20,9 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup Swift - name: Setup Swift
uses: swift-actions/setup-swift@v2 uses: swift-actions/setup-swift@v3
with: with:
swift-version: "6.1" swift-version: "6.2"
- name: Cache Swift packages - name: Cache Swift packages
uses: actions/cache@v4 uses: actions/cache@v4

View file

@ -1,13 +1,13 @@
{ {
"originHash" : "8e39da950f9cbe4c8126b1fabf0d3d6945ab547f7564fd7bb0921701f3269c14", "originHash" : "7c7cefeea2d5b6b41e4e4c63355216005204668d5b71b766db2eaeb0414dc0b8",
"pins" : [ "pins" : [
{ {
"identity" : "swift-argument-parser", "identity" : "swift-argument-parser",
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git", "location" : "https://github.com/apple/swift-argument-parser.git",
"state" : { "state" : {
"revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3", "revision" : "c5d11a805e765f52ba34ec7284bd4fcd6ba68615",
"version" : "1.6.1" "version" : "1.7.0"
} }
}, },
{ {
@ -15,8 +15,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git", "location" : "https://github.com/apple/swift-asn1.git",
"state" : { "state" : {
"revision" : "f70225981241859eb4aa1a18a75531d26637c8cc", "revision" : "810496cf121e525d660cd0ea89a758740476b85f",
"version" : "1.4.0" "version" : "1.5.1"
} }
}, },
{ {
@ -24,8 +24,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto.git", "location" : "https://github.com/apple/swift-crypto.git",
"state" : { "state" : {
"revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc", "revision" : "6f70fa9eab24c1fd982af18c281c4525d05e3095",
"version" : "3.15.1" "version" : "4.2.0"
} }
} }
], ],

View file

@ -10,8 +10,8 @@ let package = Package(
.executable(name: "TailwindCSSCLIArtifactBundler", targets: ["TailwindCSSCLIArtifactBundler"]), .executable(name: "TailwindCSSCLIArtifactBundler", targets: ["TailwindCSSCLIArtifactBundler"]),
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.0"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.7.0"),
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"), .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0"..<"5.0.0"),
], ],
targets: [ targets: [
.executableTarget( .executableTarget(

View file

@ -22,13 +22,11 @@ extension ArtifactBundleBuilder {
} }
let bundleDirURL = URL(fileURLWithPath: bundleDir) let bundleDirURL = URL(fileURLWithPath: bundleDir)
let workDirURL = bundleDirURL.deletingLastPathComponent()
let bundleName = bundleDirURL.lastPathComponent let bundleName = bundleDirURL.lastPathComponent
let process = Process() let process = Process()
process.executableURL = URL(fileURLWithPath: "/usr/bin/zip") process.executableURL = URL(fileURLWithPath: "/usr/bin/zip")
process.arguments = ["-r", zipPath, bundleName] process.arguments = ["-r", zipPath, bundleName]
process.currentDirectoryURL = workDirURL
try process.run() try process.run()
process.waitUntilExit() process.waitUntilExit()