Clear up CI issues and testing failures (#365)

phausler · web-flow · commit ca38935fc0bc · 2025-09-08T16:23:41.000-07:00
* Conditionalize the testing targets for non-windows targets to avoid the TaskDriver requirements
* Some driveby formatting fixes and remove the freebsd target since that is not supported in swiftpm yet
* Rework validation import conditions to dependency conditionals
* Exclude 5.9 workflows and enable macOS testing scheme for CI
* Additional ifdefing out non windows targets for sequence diagram testing and more formatting fixes
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -9,6 +9,8 @@ jobs:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
+      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
+      windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
       enable_wasm_sdk_build: true
       wasm_sdk_build_command: swift build -Xcc -D_WASI_EMULATED_PTHREAD
 
diff --git a/Package.swift b/Package.swift
@@ -3,11 +3,13 @@
 import PackageDescription
 import CompilerPluginSupport
 
-// Availability Macros
-
 let availabilityMacros: [SwiftSetting] = [
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"),
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"
+  ),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"
+  ),
 ]
 
 let package = Package(
@@ -43,7 +45,39 @@ let package = Package(
     ),
     .testTarget(
       name: "AsyncAlgorithmsTests",
-      dependencies: ["AsyncAlgorithms", "AsyncSequenceValidation", "AsyncAlgorithms_XCTest"],
+      dependencies: [
+        .target(name: "AsyncAlgorithms"),
+        .target(
+          name: "AsyncSequenceValidation",
+          condition: .when(platforms: [
+            .macOS,
+            .iOS,
+            .tvOS,
+            .watchOS,
+            .visionOS,
+            .macCatalyst,
+            .android,
+            .linux,
+            .openbsd,
+            .wasi,
+          ])
+        ),
+        .target(
+          name: "AsyncAlgorithms_XCTest",
+          condition: .when(platforms: [
+            .macOS,
+            .iOS,
+            .tvOS,
+            .watchOS,
+            .visionOS,
+            .macCatalyst,
+            .android,
+            .linux,
+            .openbsd,
+            .wasi,
+          ])
+        ),
+      ],
       swiftSettings: availabilityMacros + [
         .enableExperimentalFeature("StrictConcurrency=complete")
       ]
@@ -53,7 +87,7 @@ let package = Package(
 
 if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
-    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),
+    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0")
   ]
 } else {
   package.dependencies += [
diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift
@@ -6,8 +6,12 @@ import CompilerPluginSupport
 // Availability Macros
 
 let availabilityMacros: [SwiftSetting] = [
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"),
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"
+  ),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"
+  ),
 ]
 
 let package = Package(
@@ -43,7 +47,39 @@ let package = Package(
     ),
     .testTarget(
       name: "AsyncAlgorithmsTests",
-      dependencies: ["AsyncAlgorithms", "AsyncSequenceValidation", "AsyncAlgorithms_XCTest"],
+      dependencies: [
+        .target(name: "AsyncAlgorithms"),
+        .target(
+          name: "AsyncSequenceValidation",
+          condition: .when(platforms: [
+            .macOS,
+            .iOS,
+            .tvOS,
+            .watchOS,
+            .visionOS,
+            .macCatalyst,
+            .android,
+            .linux,
+            .openbsd,
+            .wasi,
+          ])
+        ),
+        .target(
+          name: "AsyncAlgorithms_XCTest",
+          condition: .when(platforms: [
+            .macOS,
+            .iOS,
+            .tvOS,
+            .watchOS,
+            .visionOS,
+            .macCatalyst,
+            .android,
+            .linux,
+            .openbsd,
+            .wasi,
+          ])
+        ),
+      ],
       swiftSettings: availabilityMacros + [
         .enableExperimentalFeature("StrictConcurrency=complete")
       ]
@@ -53,7 +89,7 @@ let package = Package(
 
 if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
-    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),
+    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0")
   ]
 } else {
   package.dependencies += [
diff --git a/Sources/AsyncAlgorithms/Buffer/AsyncBufferSequence.swift b/Sources/AsyncAlgorithms/Buffer/AsyncBufferSequence.swift
@@ -80,7 +80,7 @@ public struct AsyncBufferSequence<Base: AsyncSequence & Sendable>: AsyncSequence
   // to specify that the element is actually Sendable since the draining mechanism passes
   // through the isolation that is in nature sending but cannot be marked as such for the
   // isolated next method.
-  // In practice the users of this type are safe from isolation crossing since the Element 
+  // In practice the users of this type are safe from isolation crossing since the Element
   // is as sendable as it is required by the base sequences the buffer is constructed from.
   enum StorageType {
     case transparent(Base.AsyncIterator)
diff --git a/Sources/AsyncAlgorithms/Buffer/BoundedBufferStorage.swift b/Sources/AsyncAlgorithms/Buffer/BoundedBufferStorage.swift
@@ -109,7 +109,6 @@ final class BoundedBufferStorage<Base: AsyncSequence>: Sendable where Base: Send
           case .none:
             break
           case .resumeConsumer(let continuation, let result):
-            
             continuation.resume(returning: result)
           }
         }
diff --git a/Tests/AsyncAlgorithmsTests/TestBuffer.swift b/Tests/AsyncAlgorithmsTests/TestBuffer.swift
@@ -108,6 +108,7 @@ final class TestBuffer: XCTestCase {
     XCTAssertNil(pastFailure)
   }
 
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_given_a_base_sequence_when_bufferingOldest_then_the_policy_is_applied() async {
     validate {
       "X-12-   34-    5   |"
@@ -171,6 +172,7 @@ final class TestBuffer: XCTestCase {
       "X,,,,,,[45^]"
     }
   }
+  #endif
 
   func
     test_given_a_buffered_with_unbounded_sequence_when_cancelling_consumer_then_the_iteration_finishes_and_the_base_is_cancelled()
@@ -325,11 +327,13 @@ final class TestBuffer: XCTestCase {
     await fulfillment(of: [finished], timeout: 1.0)
   }
 
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_given_a_base_sequence_when_bounded_with_limit_0_then_the_policy_is_transparent() async {
     validate {
       "X-12-   34    -5|"
       $0.inputs[0].buffer(policy: .bounded(0))
       "X-12-   34    -5|"
     }
   }
+  #endif
 }
diff --git a/Tests/AsyncAlgorithmsTests/TestChunk.swift b/Tests/AsyncAlgorithmsTests/TestChunk.swift
@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncSequenceValidation
 import AsyncAlgorithms
 
@@ -334,3 +337,5 @@ final class TestChunk: XCTestCase {
     }
   }
 }
+
+#endif
diff --git a/Tests/AsyncAlgorithmsTests/TestDebounce.swift b/Tests/AsyncAlgorithmsTests/TestDebounce.swift
@@ -13,6 +13,7 @@ import XCTest
 import AsyncAlgorithms
 
 final class TestDebounce: XCTestCase {
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_delayingValues() throws {
     guard #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) else {
       throw XCTSkip("Skipped due to Clock/Instant/Duration availability")
@@ -67,6 +68,7 @@ final class TestDebounce: XCTestCase {
       "----|"
     }
   }
+  #endif
 
   func test_Rethrows() async throws {
     guard #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) else {
diff --git a/Tests/AsyncAlgorithmsTests/TestMerge.swift b/Tests/AsyncAlgorithmsTests/TestMerge.swift
@@ -170,6 +170,7 @@ final class TestMerge2: XCTestCase {
     XCTAssertEqual(collected.intersection(expected), expected)
   }
 
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_merge_makes_sequence_with_ordered_elements_when_sources_follow_a_timeline() {
     validate {
       "a-c-e-g-|"
@@ -178,6 +179,7 @@ final class TestMerge2: XCTestCase {
       "abcdefgh|"
     }
   }
+  #endif
 
   func test_merge_finishes_when_iteration_task_is_cancelled() async {
     let source1 = Indefinite(value: "test1")
@@ -508,6 +510,7 @@ final class TestMerge3: XCTestCase {
     XCTAssertEqual(collected.intersection(expected), expected)
   }
 
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_merge_makes_sequence_with_ordered_elements_when_sources_follow_a_timeline() {
     validate {
       "a---e---|"
@@ -517,6 +520,7 @@ final class TestMerge3: XCTestCase {
       "abcdefgh|"
     }
   }
+  #endif
 
   func test_merge_finishes_when_iteration_task_is_cancelled() async {
     let source1 = Indefinite(value: "test1")
diff --git a/Tests/AsyncAlgorithmsTests/TestThrottle.swift b/Tests/AsyncAlgorithmsTests/TestThrottle.swift
@@ -13,6 +13,7 @@ import XCTest
 import AsyncAlgorithms
 
 final class TestThrottle: XCTestCase {
+  #if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
   func test_rate_0() throws {
     guard #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) else {
       throw XCTSkip("Skipped due to Clock/Instant/Duration availability")
@@ -188,4 +189,5 @@ final class TestThrottle: XCTestCase {
       "a--d--g--j--[l|]"
     }
   }
+  #endif
 }
diff --git a/Tests/AsyncAlgorithmsTests/TestTimer.swift b/Tests/AsyncAlgorithmsTests/TestTimer.swift
@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncAlgorithms
 import AsyncSequenceValidation
 
@@ -57,3 +60,5 @@ final class TestTimer: XCTestCase {
     }
   }
 }
+
+#endif
diff --git a/Tests/AsyncAlgorithmsTests/TestValidationTests.swift b/Tests/AsyncAlgorithmsTests/TestValidationTests.swift
@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncAlgorithms
 import AsyncSequenceValidation
 @testable import AsyncAlgorithms_XCTest
@@ -354,3 +357,5 @@ struct LaggingAsyncSequence<Base: AsyncSequence, C: Clock>: AsyncSequence {
     self.clock = clock
   }
 }
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ final class BoundedBufferStorage<Base: AsyncSequence>: Sendable where Base: Send`
`109`	`109`	`case .none:`
`110`	`110`	`break`
`111`	`111`	`case .resumeConsumer(let continuation, let result):`
`112`		`-`
`113`	`112`	`continuation.resume(returning: result)`
`114`	`113`	`}`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ final class TestBuffer: XCTestCase {`
`108`	`108`	`XCTAssertNil(pastFailure)`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ #if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
`111`	`112`	`func test_given_a_base_sequence_when_bufferingOldest_then_the_policy_is_applied() async {`
`112`	`113`	`validate {`
`113`	`114`	`"X-12- 34- 5 \|"`
`@@ -171,6 +172,7 @@ final class TestBuffer: XCTestCase {`
`171`	`172`	`"X,,,,,,[45^]"`
`172`	`173`	`}`
`173`	`174`	`}`
	`175`	`+ #endif`
`174`	`176`
`175`	`177`	`func`
`176`	`178`	`test_given_a_buffered_with_unbounded_sequence_when_cancelling_consumer_then_the_iteration_finishes_and_the_base_is_cancelled()`
`@@ -325,11 +327,13 @@ final class TestBuffer: XCTestCase {`
`325`	`327`	`await fulfillment(of: [finished], timeout: 1.0)`
`326`	`328`	`}`
`327`	`329`
	`330`	`+ #if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
`328`	`331`	`func test_given_a_base_sequence_when_bounded_with_limit_0_then_the_policy_is_transparent() async {`
`329`	`332`	`validate {`
`330`	`333`	`"X-12- 34 -5\|"`
`331`	`334`	`$0.inputs[0].buffer(policy: .bounded(0))`
`332`	`335`	`"X-12- 34 -5\|"`
`333`	`336`	`}`
`334`	`337`	`}`
	`338`	`+ #endif`
`335`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`//===----------------------------------------------------------------------===//`
`11`	`11`
`12`	`12`	`import XCTest`
	`13`	`+`
	`14`	`+#if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
	`15`	`+`
`13`	`16`	`import AsyncSequenceValidation`
`14`	`17`	`import AsyncAlgorithms`
`15`	`18`
`@@ -334,3 +337,5 @@ final class TestChunk: XCTestCase {`
`334`	`337`	`}`
`335`	`338`	`}`
`336`	`339`	`}`
	`340`	`+`
	`341`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import XCTest`
`13`	`13`	`import AsyncAlgorithms`
`14`	`14`
`15`	`15`	`final class TestDebounce: XCTestCase {`
	`16`	`+ #if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
`16`	`17`	`func test_delayingValues() throws {`
`17`	`18`	`guard #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) else {`
`18`	`19`	`throw XCTSkip("Skipped due to Clock/Instant/Duration availability")`
`@@ -67,6 +68,7 @@ final class TestDebounce: XCTestCase {`
`67`	`68`	`"----\|"`
`68`	`69`	`}`
`69`	`70`	`}`
	`71`	`+ #endif`
`70`	`72`
`71`	`73`	`func test_Rethrows() async throws {`
`72`	`74`	`guard #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) else {`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ final class TestMerge2: XCTestCase {`
`170`	`170`	`XCTAssertEqual(collected.intersection(expected), expected)`
`171`	`171`	`}`
`172`	`172`
	`173`	`+ #if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
`173`	`174`	`func test_merge_makes_sequence_with_ordered_elements_when_sources_follow_a_timeline() {`
`174`	`175`	`validate {`
`175`	`176`	`"a-c-e-g-\|"`
`@@ -178,6 +179,7 @@ final class TestMerge2: XCTestCase {`
`178`	`179`	`"abcdefgh\|"`
`179`	`180`	`}`
`180`	`181`	`}`
	`182`	`+ #endif`
`181`	`183`
`182`	`184`	`func test_merge_finishes_when_iteration_task_is_cancelled() async {`
`183`	`185`	`let source1 = Indefinite(value: "test1")`
`@@ -508,6 +510,7 @@ final class TestMerge3: XCTestCase {`
`508`	`510`	`XCTAssertEqual(collected.intersection(expected), expected)`
`509`	`511`	`}`
`510`	`512`
	`513`	`+ #if canImport(Darwin) \|\| canImport(Glibc) \|\| canImport(Musl) \|\| canImport(Bionic) \|\| canImport(wasi_pthread)`
`511`	`514`	`func test_merge_makes_sequence_with_ordered_elements_when_sources_follow_a_timeline() {`
`512`	`515`	`validate {`
`513`	`516`	`"a---e---\|"`
`@@ -517,6 +520,7 @@ final class TestMerge3: XCTestCase {`
`517`	`520`	`"abcdefgh\|"`
`518`	`521`	`}`
`519`	`522`	`}`
	`523`	`+ #endif`
`520`	`524`
`521`	`525`	`func test_merge_finishes_when_iteration_task_is_cancelled() async {`
`522`	`526`	`let source1 = Indefinite(value: "test1")`