[ci] Windows

mxcl · mxcl · commit 8194ce73ff7d · 2021-06-25T11:00:15.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,13 +9,12 @@ concurrency:
   group: ${{ github.head_ref }}
   cancel-in-progress: true
 jobs:
-  smoke:
+  lint:
     runs-on: ubuntu-latest
     steps:
     - uses: harupy/find-trailing-whitespace@v1.0
 
   linux:
-    name: linux
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -57,6 +56,7 @@ jobs:
           - 5.3
           - 5.4
           - 5.5
+    name: ${{ matrix.platform }} (${{ matrix.swift }})
     steps:
     - uses: actions/checkout@v2
     - run: |
@@ -71,3 +71,23 @@ jobs:
         code-coverage: true
         warnings-as-errors: true
     - uses: codecov/codecov-action@v1
+
+  windows:
+    runs-on: windows-latest
+    steps:
+      - uses: seanmiddleditch/gha-setup-vsdevenv@v3
+      - run: |
+          Install-Binary -Url "https://swift.org/builds/swift-5.4.1-release/windows10/swift-5.4.1-RELEASE/swift-5.4.1-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
+      - run: |
+          echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      - run: |
+          echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - run: |
+          Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
+          Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
+          Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
+          Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
+      - uses: actions/checkout@v2
+      - run: swift test --parallel
diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ pkg.platforms = [
 ]
 pkg.swiftLanguageVersions = [.v5]
 
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 pkg.dependencies = [
     .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0")
 ]
@@ -30,7 +30,7 @@ func has(tests name: String) -> Target? {
     switch name {
     case "PMKFoundation":
         var deps = [Target.Dependency.target(name: "PMKFoundation")]
-      #if !os(Linux)
+      #if !os(Linux) && !os(Windows)
         deps.append(.product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"))
       #endif
         return .testTarget(name: "\(name)Tests", dependencies: deps, path: "Tests/\(name)")
@@ -43,7 +43,7 @@ func has(tests name: String) -> Target? {
 
 for name in ["PMKCloudKit", "PMKCoreLocation", "PMKFoundation", "PMKHealthKit", "PMKHomeKit", "PMKMapKit", "PMKPhotos", "PMKStoreKit", "PromiseKit"] {
 
-  #if os(Linux)
+  #if os(Linux) || os(Windows)
     guard name == "PromiseKit" || name == "PMKFoundation" else { continue }
   #endif
 
diff --git a/Sources/PMKFoundation/NSObject+Promise.swift b/Sources/PMKFoundation/NSObject+Promise.swift
@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 
 import Foundation
 #if !PMKCocoaPods
diff --git a/Sources/PMKFoundation/NSURLSession+Promise.swift b/Sources/PMKFoundation/NSURLSession+Promise.swift
@@ -128,7 +128,7 @@ extension URL: URLRequestConvertible {
 }
 
 
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 public extension String {
     /**
       - Remark: useful when converting a `URLSession` response into a `String`
diff --git a/Sources/PMKFoundation/afterlife.swift b/Sources/PMKFoundation/afterlife.swift
@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 
 import Foundation
 #if !PMKCocoaPods
diff --git a/Sources/PromiseKit/Dispatchers/CoreDataDispatcher.swift b/Sources/PromiseKit/Dispatchers/CoreDataDispatcher.swift
@@ -1,4 +1,4 @@
-#if !os(Linux)
+#if canImport(CoreData)
 
 import Foundation
 import CoreData
@@ -28,4 +28,3 @@ public struct CoreDataDispatcher: Dispatcher {
 }
 
 #endif
-
diff --git a/Sources/PromiseKit/Guarantee.swift b/Sources/PromiseKit/Guarantee.swift
@@ -380,14 +380,3 @@ public extension Dispatcher {
         return rg
     }
 }
-
-#if os(Linux)
-import func CoreFoundation._CFIsMainThread
-
-extension Thread {
-    // `isMainThread` is not implemented yet in swift-corelibs-foundation.
-    static var isMainThread: Bool {
-        return _CFIsMainThread()
-    }
-}
-#endif
diff --git a/Sources/PromiseKit/hang.swift b/Sources/PromiseKit/hang.swift
@@ -1,3 +1,5 @@
+#if canImport(CoreFoundation)
+
 import Foundation
 import CoreFoundation
 
@@ -64,3 +66,5 @@ public func hang<T>(_ promise: Promise<T>) throws -> T {
 public func hang<T>(_ promise: CancellablePromise<T>) throws -> T {
     return try hang(promise.promise)
 }
+
+#endif
diff --git a/Tests/A+/JavaScript/AllTests.swift b/Tests/A+/JavaScript/AllTests.swift
@@ -5,7 +5,7 @@
 //  Created by Lois Di Qual on 2/28/18.
 //
 
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 import JavaScriptCore
 import PromiseKit
 import XCTest
diff --git a/Tests/A+/JavaScript/JSAdapter.swift b/Tests/A+/JavaScript/JSAdapter.swift
@@ -5,7 +5,7 @@
 //  Created by Lois Di Qual on 3/2/18.
 //
 
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 import JavaScriptCore
 import PromiseKit
 
diff --git a/Tests/A+/JavaScript/JSPromise.swift b/Tests/A+/JavaScript/JSPromise.swift
@@ -5,7 +5,7 @@
 //  Created by Lois Di Qual on 3/1/18.
 //
 
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 import JavaScriptCore
 import PromiseKit
 import XCTest
diff --git a/Tests/A+/JavaScript/JSUtils.swift b/Tests/A+/JavaScript/JSUtils.swift
@@ -5,7 +5,7 @@
 //  Created by Lois Di Qual on 3/2/18.
 //
 
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 import JavaScriptCore
 
 enum JSUtils {
diff --git a/Tests/A+/JavaScript/MockNodeEnvironment.swift b/Tests/A+/JavaScript/MockNodeEnvironment.swift
@@ -5,7 +5,7 @@
 //  Created by Lois Di Qual on 3/1/18.
 //
 
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 import JavaScriptCore
 import Foundation
 
diff --git a/Tests/A+/Swift/0.0.0.swift b/Tests/A+/Swift/0.0.0.swift
@@ -167,7 +167,15 @@ import func Glibc.random
 func arc4random() -> UInt32 {
     return UInt32(random())
 }
+#endif
+
+#if os(Windows)
+func arc4random() -> UInt32 {
+    return UInt32.random(in: UInt32.min...UInt32.max)
+}
+#endif
 
+#if os(Linux) || os(Windows)
 extension XCTestExpectation {
     func fulfill() {
         fulfill(#file, line: #line)
diff --git a/Tests/Cancel/HangTests.swift b/Tests/Cancel/HangTests.swift
@@ -1,3 +1,5 @@
+#if canImport(CoreFoundation)
+
 import PromiseKit
 import XCTest
 
@@ -46,3 +48,5 @@ class HangTests: XCTestCase {
         XCTFail("Expected error but no error was thrown")
     }
 }
+
+#endif
diff --git a/Tests/Cancel/Utilities.swift b/Tests/Cancel/Utilities.swift
@@ -1,4 +1,5 @@
 import PromiseKit
+import XCTest
 
 // Workaround for error with missing libswiftContacts.dylib, this import causes the
 // library to be included as needed
@@ -24,17 +25,26 @@ extension Thread {
     }
 }
 
-import XCTest
-
 extension XCTestCase {
     func wait(for: [XCTestExpectation], timeout: TimeInterval, file: StaticString = #file, line: UInt = #line) {
         waitForExpectations(timeout: timeout, file: file, line: Int(line))
     }
 }
 
+#endif
+
+#if os(Linux) || os(Windows)
 extension XCTestExpectation {
     func fulfill() {
         fulfill(#file, line: #line)
     }
 }
 #endif
+
+#if os(Windows)
+import class Foundation.Thread
+
+func usleep(_ us: UInt32) {
+    Thread.sleep(forTimeInterval: Double(ms) / 1_000_000.0)
+}
+#endif
diff --git a/Tests/Core/HangTests.swift b/Tests/Core/HangTests.swift
@@ -1,3 +1,5 @@
+#if canImport(CoreFoundation)
+
 import PromiseKit
 import XCTest
 
@@ -36,3 +38,5 @@ class HangTests: XCTestCase {
         XCTFail("Expected error but no error was thrown")
     }
 }
+
+#endif
diff --git a/Tests/Core/Utilities.swift b/Tests/Core/Utilities.swift
@@ -1,4 +1,5 @@
 import PromiseKit
+import XCTest
 
 extension Promise {
     func silenceWarning() {}
@@ -18,17 +19,26 @@ extension Thread {
     }
 }
 
-import XCTest
-
 extension XCTestCase {
     func wait(for: [XCTestExpectation], timeout: TimeInterval, file: StaticString = #file, line: UInt = #line) {
         waitForExpectations(timeout: timeout, file: file, line: Int(line))
     }
 }
 
+#endif
+
+#if os(Linux) || os(Windows)
 extension XCTestExpectation {
     func fulfill() {
         fulfill(#file, line: #line)
     }
 }
 #endif
+
+#if os(Windows)
+import class Foundation.Thread
+
+func usleep(_ us: UInt32) {
+    Thread.sleep(forTimeInterval: Double(ms) / 1_000_000.0)
+}
+#endif
diff --git a/Tests/PMKFoundation/TestNSObject.swift b/Tests/PMKFoundation/TestNSObject.swift
@@ -3,7 +3,7 @@ import Foundation
 import PromiseKit
 import XCTest
 
-#if !os(Linux)
+#if !os(Linux) && !os(Windows)
 
 class NSObjectTests: XCTestCase {
     func testKVO() {
diff --git a/Tests/PMKFoundation/TestNSURLSession.swift b/Tests/PMKFoundation/TestNSURLSession.swift
@@ -1,4 +1,4 @@
-#if !os(Linux) && !os(watchOS)
+#if !os(Linux) && !os(watchOS) && !os(Windows)
 
 import OHHTTPStubsSwift
 import PMKFoundation

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !os(Linux)`
	`1`	`+#if !os(Linux) && !os(Windows)`
`2`	`2`
`3`	`3`	`import Foundation`
`4`	`4`	`#if !PMKCocoaPods`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ extension URL: URLRequestConvertible {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`
`131`		`-#if !os(Linux)`
	`131`	`+#if !os(Linux) && !os(Windows)`
`132`	`132`	`public extension String {`
`133`	`133`	`/**`
`134`	`134`	- Remark: useful when converting a `URLSession` response into a `String`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !os(Linux)`
	`1`	`+#if canImport(CoreData)`
`2`	`2`
`3`	`3`	`import Foundation`
`4`	`4`	`import CoreData`
`@@ -28,4 +28,3 @@ public struct CoreDataDispatcher: Dispatcher {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`#endif`
`31`		`-`