Skip to content

Commit 9b69eef

Browse files
kateinoigakukunkateinoigakukun
committed
Fix build-examples CI hang
1 parent d401c39 commit 9b69eef

4 files changed

Lines changed: 25 additions & 31 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,7 @@ jobs:
176176
- uses: swiftwasm/setup-swiftwasm@v2
177177
id: setup-wasm32-unknown-wasip1-threads
178178
with: { target: wasm32-unknown-wasip1-threads }
179-
- run: |
180-
swift --version
181-
./Utilities/build-examples.sh
179+
- run: ./Utilities/build-examples.sh
182180
env:
183181
SWIFT_SDK_ID_wasm32_unknown_wasip1_threads: ${{ steps.setup-wasm32-unknown-wasip1-threads.outputs.swift-sdk-id }}
184182
SWIFT_SDK_ID_wasm32_unknown_wasip1: ${{ steps.setup-wasm32-unknown-wasip1.outputs.swift-sdk-id }}

‎Plugins/PackageToJS/Tests/ExampleTests.swift‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@ extension Trait where Self == ConditionTrait {
227227
fileURLWithPath: "swift",
228228
relativeTo: URL(fileURLWithPath: try #require(Self.getSwiftPath()))
229229
)
230-
var args = args
231-
if args.first == "package" {
232-
args.insert(contentsOf: ["--build-system", "native"], at: 1)
233-
}
234230
try runProcess(swiftExecutable, args, env)
235231
}
236232
try body(destination.appending(path: path), runProcess, runSwift)
@@ -250,11 +246,11 @@ extension Trait where Self == ConditionTrait {
250246
func basic() throws {
251247
let swiftSDKID = try #require(Self.getSwiftSDKID())
252248
try withPackage(at: "Examples/Basic") { packageDir, _, runSwift in
253-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
254-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "dwarf"], [:])
255-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "name"], [:])
249+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
250+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "dwarf"], [:])
251+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "--debug-info-format", "name"], [:])
256252
try runSwift(
257-
["package", "--swift-sdk", swiftSDKID, "-Xswiftc", "-DJAVASCRIPTKIT_WITHOUT_WEAKREFS", "js"],
253+
["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "-Xswiftc", "-DJAVASCRIPTKIT_WITHOUT_WEAKREFS", "js"],
258254
[:]
259255
)
260256
}
@@ -270,7 +266,7 @@ extension Trait where Self == ConditionTrait {
270266
try runProcess(which("npm"), ["install"], [:])
271267
try runProcess(which("npx"), ["playwright", "install", "chromium-headless-shell"], [:])
272268

273-
try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
269+
try runSwift(["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
274270
try withTemporaryDirectory(body: { tempDir, _ in
275271
let scriptContent = """
276272
const fs = require('fs');
@@ -282,7 +278,7 @@ extension Trait where Self == ConditionTrait {
282278
let scriptPath = tempDir.appending(path: "script.js")
283279
try runSwift(
284280
[
285-
"package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
281+
"package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test",
286282
"-Xnode=--require=\(scriptPath.path)",
287283
],
288284
[:]
@@ -295,7 +291,7 @@ extension Trait where Self == ConditionTrait {
295291
)
296292
})
297293
try runSwift(
298-
["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser"],
294+
["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser"],
299295
[:]
300296
)
301297
}
@@ -308,7 +304,7 @@ extension Trait where Self == ConditionTrait {
308304
let swiftPath = try #require(Self.getSwiftPath())
309305
try withPackage(at: "Examples/Testing") { packageDir, runProcess, runSwift in
310306
try runSwift(
311-
["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--enable-code-coverage"],
307+
["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--enable-code-coverage"],
312308
[
313309
"LLVM_PROFDATA_PATH": URL(fileURLWithPath: swiftPath).appending(path: "llvm-profdata").path
314310
]
@@ -336,23 +332,23 @@ extension Trait where Self == ConditionTrait {
336332
func multithreading() throws {
337333
let swiftSDKID = try #require(Self.getSwiftSDKID())
338334
try withPackage(at: "Examples/Multithreading") { packageDir, _, runSwift in
339-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
335+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
340336
}
341337
}
342338

343339
@Test(.requireSwiftSDK(triple: "wasm32-unknown-wasip1-threads"))
344340
func offscreenCanvas() throws {
345341
let swiftSDKID = try #require(Self.getSwiftSDKID())
346342
try withPackage(at: "Examples/OffscrenCanvas") { packageDir, _, runSwift in
347-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
343+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
348344
}
349345
}
350346

351347
@Test(.requireSwiftSDK(triple: "wasm32-unknown-wasip1-threads"))
352348
func actorOnWebWorker() throws {
353349
let swiftSDKID = try #require(Self.getSwiftSDKID())
354350
try withPackage(at: "Examples/ActorOnWebWorker") { packageDir, _, runSwift in
355-
try runSwift(["package", "--swift-sdk", swiftSDKID, "js"], [:])
351+
try runSwift(["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js"], [:])
356352
}
357353
}
358354

@@ -363,7 +359,7 @@ extension Trait where Self == ConditionTrait {
363359
let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())
364360
try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
365361
try runSwift(
366-
["package", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
362+
["package", "--build-system", "native", "--swift-sdk", swiftSDKID, "js", "-c", "release"],
367363
[
368364
"JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
369365
]
@@ -379,7 +375,7 @@ extension Trait where Self == ConditionTrait {
379375
at: "Plugins/PackageToJS/Fixtures/ContinuationLeakInTest/XCTest",
380376
assertTerminationStatus: { $0 != 0 }
381377
) { packageDir, _, runSwift in
382-
try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
378+
try runSwift(["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
383379
}
384380
}
385381

@@ -392,7 +388,7 @@ extension Trait where Self == ConditionTrait {
392388
at: "Plugins/PackageToJS/Fixtures/ContinuationLeakInTest/SwiftTesting",
393389
assertTerminationStatus: { $0 != 0 }
394390
) { packageDir, _, runSwift in
395-
try runSwift(["package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
391+
try runSwift(["package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test"], [:])
396392
}
397393
}
398394
#endif
@@ -409,7 +405,7 @@ extension Trait where Self == ConditionTrait {
409405

410406
try runSwift(
411407
["package", "--disable-sandbox"] + Self.stackSizeLinkerFlags + [
412-
"--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
408+
"--build-system", "native", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
413409
"--playwright-expose", "../expose.js",
414410
],
415411
[:]
@@ -431,7 +427,7 @@ extension Trait where Self == ConditionTrait {
431427

432428
try runSwift(
433429
[
434-
"package", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
430+
"package", "--build-system", "native", "--disable-sandbox", "--swift-sdk", swiftSDKID, "js", "test", "--environment", "browser",
435431
"--playwright-expose", "../expose.js",
436432
],
437433
[:]

‎Sources/JavaScriptEventLoop/JavaScriptEventLoop+ExecutorFactory.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,12 @@ extension JavaScriptEventLoop: SchedulingExecutor {
5757
#endif // #if compiler(>=6.4) (Embedded)
5858
#else // #if hasFeature(Embedded)
5959
let duration: Duration
60-
// Handle clocks we know
6160
if let _ = clock as? ContinuousClock {
6261
duration = delay as! ContinuousClock.Duration
6362
} else if let _ = clock as? SuspendingClock {
6463
duration = delay as! SuspendingClock.Duration
6564
} else {
6665
fatalError("Unsupported clock type; only ContinuousClock and SuspendingClock are supported")
67-
return
6866
}
6967
let milliseconds = Self.delayInMilliseconds(from: duration)
7068
self.enqueue(

‎Utilities/build-examples.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ EXCLUDED_EXAMPLES=()
66

77
for example in Examples/*; do
88
skip_example=false
9-
for excluded in "${EXCLUDED_EXAMPLES[@]}"; do
10-
if [[ "$example" == *"$excluded"* ]]; then
11-
skip_example=true
12-
break
13-
fi
14-
done
9+
if ((${#EXCLUDED_EXAMPLES[@]})); then
10+
for excluded in "${EXCLUDED_EXAMPLES[@]}"; do
11+
if [[ "$example" == *"$excluded"* ]]; then
12+
skip_example=true
13+
break
14+
fi
15+
done
16+
fi
1517
if [ "$skip_example" = true ]; then
1618
echo "Skipping $example"
1719
continue

0 commit comments

Comments
 (0)