From 09fd43318b0497b6eaa617096e05256b65cb87c2 Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Sat, 2 Aug 2025 22:15:27 +0900 Subject: [PATCH 1/2] Use swiftlang/github-workflows' workflow for Wasm Resolves https://github.com/apple/swift-argument-parser/pull/794#issuecomment-3045465439 --- .github/workflows/pull_request.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 327460278..84de3386e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -53,22 +53,13 @@ jobs: wasm-build: name: Wasm Build - runs-on: ubuntu-latest - container: - image: swift:6.1-noble - steps: - - name: Checkout repo - 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 list - - name: Build - run: | - swift build --swift-sdk wasm32-unknown-wasi --target ArgumentParser - swift build --swift-sdk wasm32-unknown-wasip1-threads --target ArgumentParser + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + with: + enable_wasm_sdk_build: true + enable_linux_checks: false + enable_windows_checks: false + swift_flags: --target ArgumentParser + swift_nightly_flags: --target ArgumentParser soundness: name: Soundness From 136b03c2513b9f057ab037846a35033f7db6b6fc Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:22:14 +0900 Subject: [PATCH 2/2] Refactor with the new `wasm_sdk_build_command` --- .github/workflows/pull_request.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 84de3386e..89069efed 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -27,6 +27,8 @@ jobs: windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]" enable_macos_checks: true macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.0\"}, {\"xcode_version\": \"16.1\"}]" + enable_wasm_sdk_build: true + wasm_sdk_build_command: swift build --target ArgumentParser cmake-build: name: CMake Build @@ -51,16 +53,6 @@ jobs: - name: Build run: cmake --build .cmake-build - wasm-build: - name: Wasm Build - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main - with: - enable_wasm_sdk_build: true - enable_linux_checks: false - enable_windows_checks: false - swift_flags: --target ArgumentParser - swift_nightly_flags: --target ArgumentParser - soundness: name: Soundness uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main