Update WASM CI to run for wasi target (#37)

Kyle-Ye · web-flow · commit 0313a7c0a266 · 2024-02-19T02:13:36.000+08:00
* Update WASM CI to run for wasi target

* Fix swift-testing version

* Add test helper target

* Update warning as errors config

* Fix os(WASI) build issue
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -25,7 +25,8 @@ jobs:
           swift-version: ${{ matrix.swift_version }}
       - name: build
         run: |
-          swift build ${{ matrix.extra_params }}
+          swift build --triple wasm32-unknown-wasi ${{ matrix.extra_params }}
+      # Blocked by upstream support for WASM. See https://github.com/apple/swift-testing/issues/228
       # - name: test
       #   run: |
-      #     swift test
+      #     swift test --triple wasm32-unknown-wasi ${{ matrix.extra_params }}
diff --git a/Package.resolved b/Package.resolved
@@ -6,7 +6,7 @@
       "location" : "https://github.com/OpenSwiftUIProject/OpenGraph",
       "state" : {
         "branch" : "main",
-        "revision" : "8f0376278186b6e24e8d7a07a560f3efaa2fef1d"
+        "revision" : "8cc89abc1fff74b387a083eab8ffa91f1b9fdca7"
       }
     },
     {
diff --git a/Package.swift b/Package.swift
@@ -4,32 +4,63 @@
 import Foundation
 import PackageDescription
 
-let isXcodeEnv = ProcessInfo.processInfo.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode"
+func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
+    guard let value = Context.environment[key] else {
+        return defaultValue
+    }
+    if value == "1" {
+        return true
+    } else if value == "0" {
+        return false
+    } else {
+        return defaultValue
+    }
+}
+
+let isXcodeEnv = Context.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode"
+
 // Xcode use clang as linker which supports "-iframework" while SwiftPM use swiftc as linker which supports "-Fsystem"
 let systemFrameworkSearchFlag = isXcodeEnv ? "-iframework" : "-Fsystem"
 
+var sharedSwiftSettings: [SwiftSetting] = [
+    .enableExperimentalFeature("AccessLevelOnImport"),
+    .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"),
+]
+
+let warningsAsErrorsCondition = envEnable("OPENSWIFTUI_WERROR", default: isXcodeEnv)
+if warningsAsErrorsCondition {
+    sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"]))
+}
+
 let openSwiftUITarget = Target.target(
     name: "OpenSwiftUI",
     dependencies: [
         "OpenSwiftUIShims",
         .target(name: "CoreServices", condition: .when(platforms: [.iOS])),
         .product(name: "OpenGraphShims", package: "OpenGraph"),
     ],
-    swiftSettings: [
-        .enableExperimentalFeature("AccessLevelOnImport"),
-        .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"),
-    ]
+    swiftSettings: sharedSwiftSettings
 )
 let openSwiftUITestTarget = Target.testTarget(
     name: "OpenSwiftUITests",
     dependencies: [
         "OpenSwiftUI",
     ],
-    exclude: ["README.md"]
+    exclude: ["README.md"],
+    swiftSettings: sharedSwiftSettings
+)
+let openSwiftUITempTestTarget = Target.testTarget(
+    name: "OpenSwiftUITempTests",
+    dependencies: [
+        "OpenSwiftUI",
+    ],
+    exclude: ["README.md"],
+    swiftSettings: sharedSwiftSettings
 )
 let openSwiftUICompatibilityTestTarget = Target.testTarget(
     name: "OpenSwiftUICompatibilityTests",
-    exclude: ["README.md"]
+    exclude: ["README.md"],
+    swiftSettings: sharedSwiftSettings
 )
 
 let package = Package(
@@ -64,19 +95,6 @@ let package = Package(
     ]
 )
 
-func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
-    guard let value = ProcessInfo.processInfo.environment[key] else {
-        return defaultValue
-    }
-    if value == "1" {
-        return true
-    } else if value == "0" {
-        return false
-    } else {
-        return defaultValue
-    }
-}
-
 #if os(macOS)
 let attributeGraphCondition = envEnable("OPENGRAPH_ATTRIBUTEGRAPH", default: true)
 #else
@@ -98,6 +116,7 @@ extension Target {
 if attributeGraphCondition {
     openSwiftUITarget.addAGSettings()
     openSwiftUITestTarget.addAGSettings()
+    openSwiftUITempTestTarget.addAGSettings()
     openSwiftUICompatibilityTestTarget.addAGSettings()
 }
 
@@ -139,12 +158,19 @@ if swiftLogCondition {
 let swiftTestingCondition = envEnable("OPENSWIFTUI_SWIFT_TESTING", default: true)
 if swiftTestingCondition {
     package.dependencies.append(
-        .package(url: "https://github.com/apple/swift-testing", from: "0.3.0")
+        // Fix it to be 0.3.0 before we bump to Swift 5.10
+        .package(url: "https://github.com/apple/swift-testing", exact: "0.3.0")
     )
     openSwiftUITestTarget.dependencies.append(
         .product(name: "Testing", package: "swift-testing")
     )
     package.targets.append(openSwiftUITestTarget)
+    
+    openSwiftUITempTestTarget.dependencies.append(
+        .product(name: "Testing", package: "swift-testing")
+    )
+    package.targets.append(openSwiftUITempTestTarget)
+    
     openSwiftUICompatibilityTestTarget.dependencies.append(
         .product(name: "Testing", package: "swift-testing")
     )
diff --git a/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift b/Sources/OpenSwiftUI/AppStructure/AppOrganization/TODO/OpenSwiftUIApplication.swift
@@ -61,12 +61,13 @@ private func KitRendererCommon() -> Never {
     #elseif os(macOS)
     // FIXME
     let code = NSApplicationMain(argc, argv)
-    #elseif os(Linux)
+    #else
     let code: Int32 = 1
     #endif
     exit(code)
 }
 
+#if canImport(Darwin)
 func currentAppName() -> String {
     if let name = Bundle.main.localizedValue(for: "CFBundleDisplayName") {
         return name
@@ -90,3 +91,4 @@ extension Bundle {
         }
     }
 }
+#endif
diff --git a/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift b/Sources/OpenSwiftUI/Internal/Graph/TODO/_GraphInputs.swift
@@ -9,7 +9,7 @@ public struct _GraphInputs {
     var changedDebugProperties: _ViewDebug.Properties
     var options: _GraphInputs.Options
     // FIXME: Compile crash on Linux
-    #if !os(Linux)
+    #if canImport(Darwin)
     var mergedInputs: Set<OGAttribute>
     #endif
 }
diff --git a/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift b/Sources/OpenSwiftUI/Internal/Other/EnvironmentHelper.swift
@@ -2,6 +2,8 @@
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif os(WASI)
+import WASILibc
 #else
 #error("Unsupported Platform")
 #endif
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/AlignmentID.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/HorizontalAlignment.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/VerticalAlignment.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Alignment/ViewDimensions.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift b/Sources/OpenSwiftUI/Layout/LayoutAdjustments/Edge/EdgeInsets.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/HStack.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/Stack/_HStackLayout.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/LayoutComputer.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/Spacing.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift b/Sources/OpenSwiftUI/Layout/LayoutFundamentals/internal/_ProposedSize.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift b/Sources/OpenSwiftUI/Test/_BenchmarkHost.swift
@@ -9,7 +9,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift b/Sources/OpenSwiftUI/UIElements/Font/TODO/Font.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift b/Sources/OpenSwiftUI/UIElements/Text/TODO/Text.swift
@@ -8,7 +8,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift b/Sources/OpenSwiftUI/Views/Animations/TODO/Animatable.swift
@@ -44,7 +44,7 @@ extension Animatable where AnimatableData == EmptyAnimatableData {
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift b/Sources/OpenSwiftUI/Views/Animations/VectorArithmetic.swift
@@ -59,7 +59,7 @@ extension Double: VectorArithmetic {
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/View/ViewTransform.swift b/Sources/OpenSwiftUI/Views/View/ViewTransform.swift
@@ -2,7 +2,7 @@
 
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift b/Sources/OpenSwiftUI/Views/View/_IdentifiedViewProxy.swift
@@ -1,6 +1,6 @@
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Sources/OpenSwiftUIShims/include/LockedPointer.h b/Sources/OpenSwiftUIShims/include/LockedPointer.h
@@ -16,7 +16,7 @@
 #define OPENSWIFTUI_LOCK_INIT OS_UNFAIR_LOCK_INIT
 #define OPENSWIFTUI_LOCK_LOCK(lock) os_unfair_lock_lock(lock)
 #define OPENSWIFTUI_LOCK_UNLOCK(lock) os_unfair_lock_unlock(lock)
-#elif OPENSWIFTUI_TARGET_OS_LINUX
+#else
 #define OPENSWIFTUI_LOCK_T int32_t
 #include <stdint.h>
 #include <unistd.h>
diff --git a/Tests/OpenSwiftUITempTests/README.md b/Tests/OpenSwiftUITempTests/README.md
@@ -0,0 +1,7 @@
+## OpenSwiftUITempTests
+
+A temporary test target to iterate new test case.
+
+Remove this once the IDE support for swift-testing is provided.
+
+Please do not commit any new files to this folder.
diff --git a/Tests/OpenSwiftUITempTests/Scaffolding.swift b/Tests/OpenSwiftUITempTests/Scaffolding.swift
@@ -0,0 +1,15 @@
+//
+//  Scaffolding.swift
+//
+//
+//  Created by Kyle on 2023/11/8.
+//
+
+import Testing
+import XCTest
+
+final class AllTests: XCTestCase {
+    func testAll() async {
+        await XCTestScaffold.runAllTests(hostedBy: self)
+    }
+}
diff --git a/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift b/Tests/OpenSwiftUITests/Layout/LayoutAdjustments/Alignment/AlignmentIDTests.swift
@@ -9,7 +9,7 @@
 import Testing
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 
diff --git a/Tests/OpenSwiftUITests/_ViewDebugTests.swift b/Tests/OpenSwiftUITests/_ViewDebugTests.swift
@@ -9,7 +9,7 @@
 import Testing
 #if canImport(Darwin)
 import CoreGraphics
-#elseif os(Linux)
+#else
 import Foundation
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"location" : "https://github.com/OpenSwiftUIProject/OpenGraph",`
`7`	`7`	`"state" : {`
`8`	`8`	`"branch" : "main",`
`9`		`- "revision" : "8f0376278186b6e24e8d7a07a560f3efaa2fef1d"`
	`9`	`+ "revision" : "8cc89abc1fff74b387a083eab8ffa91f1b9fdca7"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,13 @@ private func KitRendererCommon() -> Never {`
`61`	`61`	`#elseif os(macOS)`
`62`	`62`	`// FIXME`
`63`	`63`	`let code = NSApplicationMain(argc, argv)`
`64`		`- #elseif os(Linux)`
	`64`	`+ #else`
`65`	`65`	`let code: Int32 = 1`
`66`	`66`	`#endif`
`67`	`67`	`exit(code)`
`68`	`68`	`}`
`69`	`69`
	`70`	`+#if canImport(Darwin)`
`70`	`71`	`func currentAppName() -> String {`
`71`	`72`	`if let name = Bundle.main.localizedValue(for: "CFBundleDisplayName") {`
`72`	`73`	`return name`
`@@ -90,3 +91,4 @@ extension Bundle {`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`	`}`
	`94`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public struct _GraphInputs {`
`9`	`9`	`var changedDebugProperties: _ViewDebug.Properties`
`10`	`10`	`var options: _GraphInputs.Options`
`11`	`11`	`// FIXME: Compile crash on Linux`
`12`		`- #if !os(Linux)`
	`12`	`+ #if canImport(Darwin)`
`13`	`13`	`var mergedInputs: Set<OGAttribute>`
`14`	`14`	`#endif`
`15`	`15`	`}`