Skip to content

Commit cef9d4a

Browse files
authored
Merge branch 'main' into enable_static_sdk_ci
2 parents de638dc + 68dea5d commit cef9d4a

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/workflows/main.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,11 @@ jobs:
1919

2020
static-sdk:
2121
name: Static SDK
22-
# Workaround https://github.com/nektos/act/issues/1875
2322
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
23+
24+
macos-tests:
25+
name: macOS tests
26+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
27+
with:
28+
runner_pool: nightly
29+
build_scheme: swift-http-structured-headers-Package

.github/workflows/pull_request.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ jobs:
2626

2727
static-sdk:
2828
name: Static SDK
29-
# Workaround https://github.com/nektos/act/issues/1875
3029
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
30+
31+
macos-tests:
32+
name: macOS tests
33+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
34+
with:
35+
runner_pool: general
36+
build_scheme: swift-http-structured-headers-Package

Sources/RawStructuredFieldValues/FieldParser.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ extension String {
639639
// We assume the string is previously validated, so the escapes are easily removed. See the doc comment for
640640
// `StrippingStringEscapesCollection` for more details on what we're doing here.
641641
let unescapedBytes = StrippingStringEscapesCollection(bytes, escapes: escapes)
642-
if #available(macOS 10.16, macCatalyst 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
642+
if #available(macOS 10.16, macCatalyst 14.0, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
643643
return String(unsafeUninitializedCapacity: unescapedBytes.count) { innerPtr in
644644
let (_, endIndex) = innerPtr.initialize(from: unescapedBytes)
645645
return endIndex

0 commit comments

Comments
 (0)