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 23
23
toolchain :
24
24
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
25
25
wasi-backend : Node
26
- target : " wasm32-unknown-wasi "
26
+ target : " wasm32-unknown-wasip1 "
27
27
- os : ubuntu-22.04
28
28
toolchain :
29
29
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:
114
114
with :
115
115
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
116
116
- 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 }
119
119
- uses : swiftwasm/setup-swiftwasm@v2
120
120
id : setup-wasm32-unknown-wasip1-threads
121
121
with : { target: wasm32-unknown-wasip1-threads }
122
122
- run : ./Utilities/build-examples.sh
123
123
env :
124
124
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 }}
126
126
- name : Upload static files as artifact
127
127
id : deployment
128
128
uses : actions/upload-pages-artifact@v4
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
set -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 1
1
#! /bin/bash
2
2
set -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} " \
4
4
plugin --allow-writing-to-package-directory \
5
5
js --use-cdn --output ./Bundle
Original file line number Diff line number Diff line change @@ -80,6 +80,12 @@ extension Trait where Self == ConditionTrait {
80
80
else {
81
81
return false
82
82
}
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
+ }
83
89
let embeddedSDKID = " \( swiftSDKID) -embedded "
84
90
return isSwiftSDKAvailable ( embeddedSDKID, swiftPath: swiftPath)
85
91
} ( ) ,
@@ -206,6 +212,7 @@ extension Trait where Self == ConditionTrait {
206
212
Swift package should build successfully, check \( destination. appending ( path: path) . path) for details
207
213
stdout: \( stdoutPath. path)
208
214
stderr: \( stderrPath. path)
215
+ arguments: \( args)
209
216
210
217
\( ( try ? String ( contentsOf: stdoutPath, encoding: . utf8) ) ?? " <<stdout is empty>> " )
211
218
\( ( try ? String ( contentsOf: stderrPath, encoding: . utf8) ) ?? " <<stderr is empty>> " )
You can’t perform that action at this time.
0 commit comments