Skip to content

Commit ee4a717

Browse files
Sync recent Package.swift changes with the 6.1 manifest (#159)
1 parent 305258a commit ee4a717

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,28 @@ jobs:
7474
strategy:
7575
matrix:
7676
include:
77-
- swift: "5.8-focal"
77+
- swift: "swift:5.8-focal"
7878
development-toolchain-download: "https://download.swift.org/development/ubuntu2004/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu20.04.tar.gz"
7979
wasi-swift-sdk-download: "https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
8080
wasi-swift-sdk-id: DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
81-
- swift: "5.9-focal"
81+
- swift: "swift:5.9-focal"
8282
development-toolchain-download: "https://download.swift.org/development/ubuntu2004/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu20.04.tar.gz"
8383
wasi-swift-sdk-download: "https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
8484
wasi-swift-sdk-id: DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
85-
- swift: "5.9-amazonlinux2"
85+
- swift: "swift:5.9-amazonlinux2"
8686
development-toolchain-download: "https://download.swift.org/development/amazonlinux2/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-amazonlinux2.tar.gz"
8787
wasi-swift-sdk-download: "https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
8888
wasi-swift-sdk-id: DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
89-
- swift: "6.0-focal"
89+
- swift: "swift:6.0-focal"
9090
development-toolchain-download: "https://download.swift.org/development/ubuntu2004/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu20.04.tar.gz"
9191
wasi-swift-sdk-download: "https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
9292
wasi-swift-sdk-id: DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
9393
test-args: "--enable-code-coverage"
9494
build-dev-dashboard: true
95+
- swift: "swiftlang/swift:nightly-main-jammy"
96+
development-toolchain-download: "https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu22.04.tar.gz"
97+
wasi-swift-sdk-download: "https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
98+
wasi-swift-sdk-id: DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
9599

96100
runs-on: ubuntu-20.04
97101
name: "build-linux (${{ matrix.swift }})"
@@ -100,7 +104,7 @@ jobs:
100104
- uses: actions/checkout@v4
101105
- name: Configure container
102106
run: |
103-
docker run -dit --name build-container -v $PWD:/workspace -w /workspace swift:${{ matrix.swift }}
107+
docker run -dit --name build-container -v $PWD:/workspace -w /workspace ${{ matrix.swift }}
104108
echo 'docker exec -i build-container "$@"' > ./build-exec
105109
chmod +x ./build-exec
106110

Package@swift-6.1.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,14 @@ let package = Package(
5151
exclude: ["CMakeLists.txt"]
5252
),
5353
.target(name: "_CWasmKit"),
54+
.target(
55+
name: "WasmKitFuzzing",
56+
dependencies: ["WasmKit"],
57+
path: "FuzzTesting/Sources/WasmKitFuzzing"
58+
),
5459
.testTarget(
5560
name: "WasmKitTests",
56-
dependencies: ["WasmKit", "WAT"],
61+
dependencies: ["WasmKit", "WAT", "WasmKitFuzzing"],
5762
exclude: ["ExtraSuite"]
5863
),
5964

0 commit comments

Comments
 (0)