File tree Expand file tree Collapse file tree 4 files changed +13
-6
lines changed
Plugins/PackageToJS/Tests Expand file tree Collapse file tree 4 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 2323 toolchain :
2424 download-url : https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
2525 wasi-backend : Node
26- target : " wasm32-unknown-wasi "
26+ target : " wasm32-unknown-wasip1 "
2727 - os : ubuntu-22.04
2828 toolchain :
2929 download-url : https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
@@ -114,15 +114,15 @@ jobs:
114114 with :
115115 download-url : https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a/swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-ubuntu22.04.tar.gz
116116 - uses : swiftwasm/setup-swiftwasm@v2
117- id : setup-wasm32-unknown-wasi
118- with : { target: wasm32-unknown-wasi }
117+ id : setup-wasm32-unknown-wasip1
118+ with : { target: wasm32-unknown-wasip1 }
119119 - uses : swiftwasm/setup-swiftwasm@v2
120120 id : setup-wasm32-unknown-wasip1-threads
121121 with : { target: wasm32-unknown-wasip1-threads }
122122 - run : ./Utilities/build-examples.sh
123123 env :
124124 SWIFT_SDK_ID_wasm32_unknown_wasip1_threads : ${{ steps.setup-wasm32-unknown-wasip1-threads.outputs.swift-sdk-id }}
125- SWIFT_SDK_ID_wasm32_unknown_wasi : ${{ steps.setup-wasm32-unknown-wasi .outputs.swift-sdk-id }}
125+ SWIFT_SDK_ID_wasm32_unknown_wasip1 : ${{ steps.setup-wasm32-unknown-wasip1 .outputs.swift-sdk-id }}
126126 - name : Upload static files as artifact
127127 id : deployment
128128 uses : actions/upload-pages-artifact@v4
Original file line number Diff line number Diff line change 11#! /bin/bash
22set -euxo pipefail
3- swift package --swift-sdk " ${SWIFT_SDK_ID_wasm32_unknown_wasi :- ${SWIFT_SDK_ID:- wasm32-unknown-wasi } } " -c " ${1:- debug} " js --use-cdn
3+ swift package --swift-sdk " ${SWIFT_SDK_ID_wasm32_unknown_wasip1 :- ${SWIFT_SDK_ID:- wasm32-unknown-wasip1 } } " -c " ${1:- debug} " js --use-cdn
Original file line number Diff line number Diff line change 11#! /bin/bash
22set -euxo pipefail
3- env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk " ${SWIFT_SDK_ID_wasm32_unknown_wasi :- ${SWIFT_SDK_ID:- wasm32-unknown-wasi } } " -c " ${1:- debug} " \
3+ env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk " ${SWIFT_SDK_ID_wasm32_unknown_wasip1 :- ${SWIFT_SDK_ID:- wasm32-unknown-wasip1 } } " -c " ${1:- debug} " \
44 plugin --allow-writing-to-package-directory \
55 js --use-cdn --output ./Bundle
Original file line number Diff line number Diff line change @@ -80,6 +80,12 @@ extension Trait where Self == ConditionTrait {
8080 else {
8181 return false
8282 }
83+ guard [ " wasm32-unknown-wasi " , " wasm32-unknown-wasip1 " ] . contains ( where: {
84+ swiftSDKID. hasSuffix ( $0)
85+ } ) else {
86+ // Only non-threads SDKs are supported for embedded in Swift SDK
87+ return false
88+ }
8389 let embeddedSDKID = " \( swiftSDKID) -embedded "
8490 return isSwiftSDKAvailable ( embeddedSDKID, swiftPath: swiftPath)
8591 } ( ) ,
@@ -206,6 +212,7 @@ extension Trait where Self == ConditionTrait {
206212 Swift package should build successfully, check \( destination. appending ( path: path) . path) for details
207213 stdout: \( stdoutPath. path)
208214 stderr: \( stderrPath. path)
215+ arguments: \( args)
209216
210217 \( ( try ? String ( contentsOf: stdoutPath, encoding: . utf8) ) ?? " <<stdout is empty>> " )
211218 \( ( try ? String ( contentsOf: stderrPath, encoding: . utf8) ) ?? " <<stderr is empty>> " )
You can’t perform that action at this time.
0 commit comments