From ac721bc9164609df721c5dd67e1ca22b87b8b45d Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 09:58:44 +0100 Subject: [PATCH 1/6] Use official Swift SDK for Wasm in `pull_request.yml` --- .github/workflows/pull_request.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 32746027..0d669f13 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -61,14 +61,11 @@ jobs: uses: actions/checkout@v4 - name: Install Swift SDKs for WebAssembly run: | - # TODO: We can replace these Swift SDKs with the swift.org one once it supports Foundation. - swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 7550b4c77a55f4b637c376f5d192f297fe185607003a6212ad608276928db992 - swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasip1-threads.artifactbundle.zip --checksum 0dd273be28741f8e1eb00682c39bdc956361ed24b5572e183dd8a4e9d1c5f6ec + swift sdk install https://download.swift.org/swift-6.2-branch/wasm-sdk/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-07-23-a/swift-6.2-DEVELOPMENT-SNAPSHOT-2025-07-23-a_wasm.artifactbundle.tar.gz --checksum 0294f106efcf4ca8944da5284b7a12825e9c4ca1316daa3f45d05ea0f65bedff swift sdk list - name: Build run: | swift build --swift-sdk wasm32-unknown-wasi --target ArgumentParser - swift build --swift-sdk wasm32-unknown-wasip1-threads --target ArgumentParser soundness: name: Soundness From 649b14429c68fb057be7582be202111d1c9612f8 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 10:05:17 +0100 Subject: [PATCH 2/6] Use 6.2 Docker image for Wasm in `pull_request.yml` --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0d669f13..06ea98fd 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -55,7 +55,7 @@ jobs: name: Wasm Build runs-on: ubuntu-latest container: - image: swift:6.1-noble + image: swiftlang/swift:nightly-6.2-noble steps: - name: Checkout repo uses: actions/checkout@v4 From 14dc112e8450a08837f88e4ac350f043eb12c14a Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 10:06:33 +0100 Subject: [PATCH 3/6] Use `wasm32-unknown-wasip1` triple in `pull_request.yml` --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 06ea98fd..1c13d213 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -65,7 +65,7 @@ jobs: swift sdk list - name: Build run: | - swift build --swift-sdk wasm32-unknown-wasi --target ArgumentParser + swift build --swift-sdk wasm32-unknown-wasip1 --target ArgumentParser soundness: name: Soundness From f11b4b115687af4f263d6272afdeafec8a260d10 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 10:08:27 +0100 Subject: [PATCH 4/6] Use explicit Swift SDK ID in `pull_request.yml` --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 1c13d213..bdae3cbd 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -65,7 +65,7 @@ jobs: swift sdk list - name: Build run: | - swift build --swift-sdk wasm32-unknown-wasip1 --target ArgumentParser + swift build --swift-sdk swift-6.2-DEVELOPMENT-SNAPSHOT-2025-07-23-a_wasm --target ArgumentParser soundness: name: Soundness From 1f300ff44c9dbff4be3bf7648547e736ea1a7bf4 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 15:18:59 +0100 Subject: [PATCH 5/6] Update .github/workflows/pull_request.yml --- .github/workflows/pull_request.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bdae3cbd..602e8fe0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -55,7 +55,8 @@ jobs: name: Wasm Build runs-on: ubuntu-latest container: - image: swiftlang/swift:nightly-6.2-noble + # pinned nightly-6.2-noble with `swift-6.2-DEVELOPMENT-SNAPSHOT-2025-07-23-a` for Wasm Swift SDK + image: swiftlang/swift:ab5c6ddd6a7e steps: - name: Checkout repo uses: actions/checkout@v4 From 32cb844a1b2c17152cdd84054d9ab9abc8b6f1f0 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 24 Jul 2025 15:23:26 +0100 Subject: [PATCH 6/6] Update .github/workflows/pull_request.yml --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 602e8fe0..5e814aa6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -56,7 +56,7 @@ jobs: runs-on: ubuntu-latest container: # pinned nightly-6.2-noble with `swift-6.2-DEVELOPMENT-SNAPSHOT-2025-07-23-a` for Wasm Swift SDK - image: swiftlang/swift:ab5c6ddd6a7e + image: swiftlang/swift:nightly-6.2-noble@sha256:cc6ee97537f601b344dfe02071e91b0952212bba377ece463f1c2737984c06c2 steps: - name: Checkout repo uses: actions/checkout@v4