Fix CI issue

OpenSwiftUIProject · Sep 23, 2024 · 89c71e3 · 89c71e3
1 parent d016cb6
commit 89c71e3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/compatibility_tests.yml b/.github/workflows/compatibility_tests.yml
@@ -32,12 +32,14 @@ jobs:
       - name: Run compatibility tests on OpenSwiftUI + macOS
         run: |
           swift test \
+            --filter OpenSwiftUICompatibilityTests \
             --build-path .build-compatibility-test-debug
         env:
           OPENSWIFTUI_COMPATIBILITY_TEST: 0
       - name: Run compatibility tests on SwiftUI + macOS
         run: |
           swift test \
+            --filter OpenSwiftUICompatibilityTests \
             --build-path .build-compatibility-test-debug
         env:
           OPENSWIFTUI_COMPATIBILITY_TEST: 1
@@ -69,6 +71,7 @@ jobs:
         run: swift --version
       - name: Run compatibility tests on OpenSwiftUI + iOS
         run: |
+          # FIXME: xcodebuild will run all test targets.
           xcodebuild test \
           -scheme OpenSwiftUI \
           -configuration Debug \

diff --git a/Sources/OpenSwiftUICore/Log/Signpost.swift b/Sources/OpenSwiftUICore/Log/Signpost.swift
@@ -123,6 +123,7 @@ package struct Signpost {
         guard isEnabled else {
             return closure()
         }
+        #if canImport(Darwin)
         let id = OSSignpostID.makeExclusiveID(object)
         switch style {
         case let .kdebug(code):
@@ -138,6 +139,9 @@ package struct Signpost {
             defer { os_signpost(.end, log: _signpostLog, name: name, signpostID: id) }
             return closure()
         }
+        #else
+        return closure()
+        #endif
     }
 
     @_transparent
@@ -150,6 +154,7 @@ package struct Signpost {
         guard isEnabled else {
             return closure()
         }
+        #if canImport(Darwin)
         let id = OSSignpostID.makeExclusiveID(object)
         switch style {
         case let .kdebug(code):
@@ -161,8 +166,12 @@ package struct Signpost {
             defer { os_signpost(.end, log: _signpostLog, name: name, signpostID: id) }
             return closure()
         }
+        #else
+        return closure()
+        #endif
     }
 
+    #if canImport(Darwin)
     @_transparent
     package func traceEvent(
         type: OSSignpostType,
@@ -173,7 +182,6 @@ package struct Signpost {
         guard isEnabled else {
             return
         }
-        #if canImport(Darwin)
         let id = OSSignpostID.makeExclusiveID(object)
         let args = args()
 
@@ -185,8 +193,8 @@ package struct Signpost {
         case let .os_log(name):
             os_signpost(type, log: _signpostLog, name: name, signpostID: id, message, args)
         }
-        #endif
     }
+    #endif
 
     #if canImport(Darwin)
     private func _primitive(

diff --git a/Sources/OpenSwiftUICore/Util/ThreadUtils.swift b/Sources/OpenSwiftUICore/Util/ThreadUtils.swift
@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-@preconcurrency import Foundation
+import Foundation
 
 final package class ThreadSpecific<T> {
     var key: pthread_key_t
@@ -54,7 +54,7 @@ final package class ThreadSpecific<T> {
 package func onMainThread(do body: @escaping () -> Void) {
     #if os(WASI)
     // See #76: Thread and RunLoopMode.common is not available on WASI currently
-    block()
+    body()
     #else
     if Thread.isMainThread {
         body()
@@ -68,7 +68,9 @@ package func onMainThread(do body: @escaping () -> Void) {
 }
 
 package func mainThreadPrecondition() {
+    #if !os(WASI)
     guard Thread.isMainThread else {
         fatalError("calling into OpenSwiftUI on a non-main thread is not supported")
     }
+    #endif
 }