Merge branch 'main' into queue_outbound_close

rnro · web-flow · commit c7f73ffd487e · 2025-04-02T10:03:29.000+01:00
diff --git a/.github/workflows/macos_tests.yml b/.github/workflows/macos_tests.yml
@@ -96,6 +96,11 @@ on:
         description: "Boolean to enable the Xcode test targeting visionOS. Defaults to false."
         default: false
 
+      runner_pool:
+        type: string
+        description: "The runner pool which will be requested."
+        default: "nightly"
+
 jobs:
   construct-matrix:
     name: Construct Darwin matrix
@@ -111,6 +116,7 @@ jobs:
         run: |
           cat >> "$GITHUB_OUTPUT" << EOM
           darwin-matrix=$(
+            runner_pool="${MATRIX_RUNNER_POOL:="nightly"}"
             xcode_15_4_enabled="${MATRIX_MACOS_15_4_ENABLED:=true}"
             xcode_15_4_build_arguments_override="${MATRIX_MACOS_15_4_BUILD_ARGUMENTS_OVERRIDE:=""}"
             xcode_15_4_test_arguments_override="${MATRIX_MACOS_15_4_TEST_ARGUMENTS_OVERRIDE:=""}"
@@ -128,29 +134,42 @@ jobs:
             matrix='{"config": []}'
 
             if [[ "$xcode_15_4_enabled" == "true" ]]; then
-              matrix=$(echo "$matrix" | jq -c \
-                '.config[.config| length] |= . + { "name": "Xcode 15.4", "xcode_version": "15.4", "build_arguments_override": "${xcode_15_4_build_arguments_override}", "test_arguments_override": "${xcode_15_4_test_arguments_override}", "os": "sequoia", "arch": "ARM64"}')
+                matrix=$(echo "$matrix" | jq -c \
+                --arg build_arguments_override "$xcode_15_4_build_arguments_override"  \
+                --arg test_arguments_override "$xcode_15_4_test_arguments_override"  \
+                --arg runner_pool "$runner_pool"  \
+                '.config[.config| length] |= . + { "name": "Xcode 15.4", "xcode_version": "15.4", "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "sequoia", "arch": "ARM64", "pool": $runner_pool }')
             fi
 
             if [[ "$xcode_16_0_enabled" == "true" ]]; then
-              matrix=$(echo "$matrix" | jq -c \
-                '.config[.config| length] |= . + { "name": "Xcode 16.0", "xcode_version": "16.0", "build_arguments_override": "${xcode_16_0_build_arguments_override}", "test_arguments_override": "${xcode_16_0_test_arguments_override}", "os": "sequoia", "arch": "ARM64"}')
+                matrix=$(echo "$matrix" | jq -c \
+                --arg build_arguments_override "$xcode_16_0_build_arguments_override"  \
+                --arg test_arguments_override "$xcode_16_0_test_arguments_override"  \
+                --arg runner_pool "$runner_pool"  \
+                '.config[.config| length] |= . + { "name": "Xcode 16.0", "xcode_version": "16.0", "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "sequoia", "arch": "ARM64", "pool": $runner_pool }')
             fi
 
             if [[ "$xcode_16_1_enabled" == "true" ]]; then
-              matrix=$(echo "$matrix" | jq -c \
-                '.config[.config| length] |= . + { "name": "Xcode 16.1", "xcode_version": "16.1", "build_arguments_override": "${xcode_16_1_build_arguments_override}", "test_arguments_override": "${xcode_16_1_test_arguments_override}", "os": "sequoia", "arch": "ARM64"}')
+                matrix=$(echo "$matrix" | jq -c \
+                --arg build_arguments_override "$xcode_16_1_build_arguments_override"  \
+                --arg test_arguments_override "$xcode_16_1_test_arguments_override"  \
+                --arg runner_pool "$runner_pool"  \
+                '.config[.config| length] |= . + { "name": "Xcode 16.1", "xcode_version": "16.1", "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "sequoia", "arch": "ARM64", "pool": $runner_pool }')
             fi
 
             if [[ "$xcode_16_2_enabled" == "true" ]]; then
-              matrix=$(echo "$matrix" | jq -c \
-                '.config[.config| length] |= . + { "name": "Xcode 16.2", "xcode_version": "16.2", "build_arguments_override": "${xcode_16_2_build_arguments_override}", "test_arguments_override": "${xcode_16_2_test_arguments_override}", "os": "sequoia", "arch": "ARM64"}')
+                matrix=$(echo "$matrix" | jq -c \
+                --arg build_arguments_override "$xcode_16_2_build_arguments_override"  \
+                --arg test_arguments_override "$xcode_16_2_test_arguments_override"  \
+                --arg runner_pool "$runner_pool"  \
+                '.config[.config| length] |= . + { "name": "Xcode 16.2", "xcode_version": "16.2", "build_arguments_override": $build_arguments_override, "test_arguments_override": $test_arguments_override, "os": "sequoia", "arch": "ARM64", "pool": $runner_pool }')
             fi
 
             echo "$matrix" | jq -c
           )"
           EOM
         env:
+          MATRIX_RUNNER_POOL: ${{ inputs.runner_pool }}
           MATRIX_MACOS_15_4_ENABLED: ${{ inputs.xcode_15_4_enabled }}
           MATRIX_MACOS_15_4_BUILD_ARGUMENTS_OVERRIDE: ${{ inputs.xcode_15_4_build_arguments_override }}
           MATRIX_MACOS_15_4_TEST_ARGUMENTS_OVERRIDE: ${{ inputs.xcode_15_4_test_arguments_override }}
@@ -167,7 +186,7 @@ jobs:
   darwin-job:
     name: ${{ matrix.config.name }}
     needs: construct-matrix
-    runs-on: [self-hosted, macos, "${{ matrix.config.os }}", "${{ matrix.config.arch }}"]
+    runs-on: [self-hosted, macos, "${{ matrix.config.os }}", "${{ matrix.config.arch }}", "${{ matrix.config.pool }}"]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.construct-matrix.outputs.darwin-matrix) }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -65,6 +65,7 @@ jobs:
     # Workaround https://github.com/nektos/act/issues/1875
     uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
     with:
+      runner_pool: nightly
       build_scheme: swift-nio-Package
       macos_xcode_test_enabled: false  # Disabled because of an issue
       ios_xcode_test_enabled: true
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -82,6 +82,7 @@ jobs:
     # Workaround https://github.com/nektos/act/issues/1875
     uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
     with:
+      runner_pool: general
       build_scheme: swift-nio-Package
 
   static-sdk:
diff --git a/Package.swift b/Package.swift
@@ -363,7 +363,8 @@ let package = Package(
                 "NIOHTTP1",
                 "NIOWebSocket",
             ],
-            exclude: ["README.md"]
+            exclude: ["README.md"],
+            swiftSettings: strictConcurrencySettings
         ),
         .executableTarget(
             name: "NIOWebSocketClient",
@@ -373,7 +374,8 @@ let package = Package(
                 "NIOHTTP1",
                 "NIOWebSocket",
             ],
-            exclude: ["README.md"]
+            exclude: ["README.md"],
+            swiftSettings: strictConcurrencySettings
         ),
         .executableTarget(
             name: "NIOMulticastChat",
@@ -407,7 +409,8 @@ let package = Package(
                 "NIOPosix",
                 "NIOCore",
                 "NIOHTTP1",
-            ]
+            ],
+            swiftSettings: strictConcurrencySettings
         ),
 
         // MARK: - Tests
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ It's like [Netty](https://netty.io), but written for Swift.
 
 The SwiftNIO project is split across multiple repositories:
 
-Repository | NIO 2 (Swift 5.7+)
+Repository | NIO 2
 --- | ---
 [https://github.com/apple/swift-nio][repo-nio] <br> SwiftNIO core | `from: "2.0.0"`
 [https://github.com/apple/swift-nio-ssl][repo-nio-ssl] <br> TLS (SSL) support | `from: "2.0.0"`
@@ -20,8 +20,6 @@ Repository | NIO 2 (Swift 5.7+)
 [https://github.com/apple/swift-nio-transport-services][repo-nio-transport-services] <br> first-class support for macOS, iOS, tvOS, and watchOS | `from: "1.0.0"`
 [https://github.com/apple/swift-nio-ssh][repo-nio-ssh] <br> SSH support | `.upToNextMinor(from: "0.2.0")`
 
-NIO 2.29.0 and older support Swift 5.0+, NIO 2.39.0 and older support Swift 5.2+.
-
 Within this repository we have a number of products that provide different functionality. This package contains the following products:
 
 - `NIO`. This is an umbrella module exporting `NIOCore`, `NIOEmbedded` and `NIOPosix`.
@@ -73,10 +71,10 @@ This is the current version of SwiftNIO and will be supported for the foreseeabl
 
 ### Swift Versions
 
-We commit to support the most recently released swift version (currently 5.10) and the last two minor releases before that unless this is impossible to do in one codebase.
-In addition checks are run against the latest beta release (if any) as well as the nightly swift builds and the intent is that these should pass.
+We commit to support the most recently released Swift version and the last two minor releases before that unless this is impossible to do in one codebase.
+In addition checks are run against the latest beta release (if any) as well as the nightly Swift builds and the intent is that these should pass.
 
-The most recent versions of SwiftNIO support Swift 5.9 and newer. The minimum Swift version supported by SwiftNIO releases are detailed below:
+The minimum Swift version supported by SwiftNIO releases are detailed below:
 
 SwiftNIO            | Minimum Swift Version
 --------------------|----------------------
diff --git a/Sources/NIOAsyncAwaitDemo/AsyncChannelIO.swift b/Sources/NIOAsyncAwaitDemo/AsyncChannelIO.swift
@@ -16,7 +16,7 @@ import NIOCore
 import NIOHTTP1
 
 @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-struct AsyncChannelIO<Request, Response> {
+struct AsyncChannelIO<Request: Sendable, Response: Sendable> {
     let channel: Channel
 
     init(_ channel: Channel) {
diff --git a/Sources/NIOAsyncAwaitDemo/FullRequestResponse.swift b/Sources/NIOAsyncAwaitDemo/FullRequestResponse.swift
@@ -17,7 +17,7 @@
 import NIOCore
 import NIOHTTP1
 
-public final class MakeFullRequestHandler: ChannelOutboundHandler {
+public final class MakeFullRequestHandler: ChannelOutboundHandler, Sendable {
     public typealias OutboundOut = HTTPClientRequestPart
     public typealias OutboundIn = HTTPRequestHead
 
@@ -40,7 +40,7 @@ public final class MakeFullRequestHandler: ChannelOutboundHandler {
 ///
 /// `RequestResponseHandler` requires that the `Response`s arrive on `Channel` in the same order as the `Request`s
 /// were submitted.
-public final class RequestResponseHandler<Request, Response>: ChannelDuplexHandler {
+public final class RequestResponseHandler<Request: Sendable, Response: Sendable>: ChannelDuplexHandler {
     public typealias InboundIn = Response
     public typealias InboundOut = Never
     public typealias OutboundIn = (Request, EventLoopPromise<Response>)
@@ -129,3 +129,6 @@ public final class RequestResponseHandler<Request, Response>: ChannelDuplexHandl
         }
     }
 }
+
+@available(*, unavailable)
+extension RequestResponseHandler: Sendable {}
diff --git a/scripts/install_static_sdk.sh b/scripts/install_static_sdk.sh
@@ -78,7 +78,7 @@ if [[ -n "$branch" ]]; then
 elif [[ -n "$version" ]]; then
   if [[ "$version" == "latest" ]]; then
     log "Discovering latest version"
-    version=$(curl -s https://www.swift.org/api/v1/install/releases.json | jq -r '.[-1].tag' | sed -E 's/swift-([0-9]+\.[0-9]+\.[0-9]+)-RELEASE/\1/')
+    version=$(curl -s https://www.swift.org/api/v1/install/releases.json | jq -r '.[-1].tag' | sed -E 's/swift-([0-9]+\.[0-9]+\.?[0-9]*)-RELEASE/\1/')
     if [[ -z "$version" ]]; then
       fatal "Failed to discover latest Swift version"
     fi
@@ -132,4 +132,4 @@ log "Checking swift"
 swift --version
 
 log "Installing Static SDK"
-swift sdk install "$static_sdk_path"
+swift sdk install "$static_sdk_path"
