Skip to content

Commit e6f4ab0

Browse files
heckjheckj
authored
Merge branch 'main' into swift62-readme-update
2 parents 9f28014 + aa0d800 commit e6f4ab0

File tree

67 files changed

+2567
-925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2567
-925
lines changed

‎.github/workflows/main.yml‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,36 @@ jobs:
1111
name: Unit tests
1212
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1313
with:
14-
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
15-
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
16-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
14+
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
15+
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
16+
linux_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17+
linux_6_2_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1718
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1819
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
1920

20-
integration-tests:
21+
construct-integration-test-matrix:
22+
name: Construct integration matrix
23+
runs-on: ubuntu-latest
24+
outputs:
25+
integration-test-matrix: '${{ steps.generate-matrix.outputs.integration-test-matrix }}'
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
with:
30+
persist-credentials: false
31+
- id: generate-matrix
32+
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
33+
env:
34+
MATRIX_LINUX_SETUP_COMMAND: apt-get update -y && apt-get install -yq execstack lsof dnsutils netcat-openbsd net-tools expect curl jq
35+
MATRIX_LINUX_COMMAND: ./scripts/integration_tests.sh -f test_01_renegotiation
36+
37+
integration-test:
2138
name: Integration test
22-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
39+
needs: construct-integration-test-matrix
40+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
2341
with:
2442
name: "Integration test"
25-
matrix_linux_command: "apt-get update -yq && apt-get install -yq execstack lsof dnsutils netcat-openbsd net-tools expect curl jq && ./scripts/integration_tests.sh -f test_01_renegotiation"
43+
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
2644

2745
benchmarks:
2846
name: Benchmarks
@@ -36,3 +54,13 @@ jobs:
3654
with:
3755
runner_pool: nightly
3856
build_scheme: swift-nio-ssl-Package
57+
xcode_16_2_build_arguments_override: "-Xswiftc -Xfrontend -Xswiftc -require-explicit-sendable"
58+
xcode_16_3_build_arguments_override: "-Xswiftc -Xfrontend -Xswiftc -require-explicit-sendable"
59+
60+
static-sdk:
61+
name: Static SDK
62+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
63+
64+
release-builds:
65+
name: Release builds
66+
uses: apple/swift-nio/.github/workflows/release_builds.yml@main

‎.github/workflows/pull_request.yml‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,36 @@ jobs:
1414
name: Unit tests
1515
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1616
with:
17-
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
1817
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
1918
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
19+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
20+
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2021
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2122
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2223

23-
integration-tests:
24+
construct-integration-test-matrix:
25+
name: Construct integration matrix
26+
runs-on: ubuntu-latest
27+
outputs:
28+
integration-test-matrix: '${{ steps.generate-matrix.outputs.integration-test-matrix }}'
29+
steps:
30+
- name: Checkout repository
31+
uses: actions/checkout@v4
32+
with:
33+
persist-credentials: false
34+
- id: generate-matrix
35+
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
36+
env:
37+
MATRIX_LINUX_SETUP_COMMAND: apt-get update -y && apt-get install -yq execstack lsof dnsutils netcat-openbsd net-tools expect curl jq
38+
MATRIX_LINUX_COMMAND: ./scripts/integration_tests.sh -f test_01_renegotiation
39+
40+
integration-test:
2441
name: Integration test
25-
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
42+
needs: construct-integration-test-matrix
43+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
2644
with:
2745
name: "Integration test"
28-
matrix_linux_command: "apt-get update -yq && apt-get install -yq execstack lsof dnsutils netcat-openbsd net-tools expect curl jq && ./scripts/integration_tests.sh"
46+
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
2947

3048
benchmarks:
3149
name: Benchmarks
@@ -43,3 +61,13 @@ jobs:
4361
with:
4462
runner_pool: general
4563
build_scheme: swift-nio-ssl-Package
64+
xcode_16_2_build_arguments_override: "-Xswiftc -Xfrontend -Xswiftc -require-explicit-sendable"
65+
xcode_16_3_build_arguments_override: "-Xswiftc -Xfrontend -Xswiftc -require-explicit-sendable"
66+
67+
static-sdk:
68+
name: Static SDK
69+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
70+
71+
release-builds:
72+
name: Release builds
73+
uses: apple/swift-nio/.github/workflows/release_builds.yml@main

‎Benchmarks/Benchmarks/NIOSSLBenchmarks/Benchmarks.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ let benchmarks = {
2828
metrics: defaultMetrics,
2929
scalingFactor: .kilo,
3030
maxDuration: .seconds(10_000_000),
31-
maxIterations: 10,
32-
thresholds: [.mallocCountTotal: .init(absolute: [.p90: 2000])]
31+
maxIterations: 10
3332
)
3433
) { benchmark in
3534
try runSimpleHandshake(
@@ -43,8 +42,7 @@ let benchmarks = {
4342
metrics: defaultMetrics,
4443
scalingFactor: .kilo,
4544
maxDuration: .seconds(10_000_000),
46-
maxIterations: 10,
47-
thresholds: [.mallocCountTotal: .init(absolute: [.p90: 2000])]
45+
maxIterations: 10
4846
)
4947
) { benchmark in
5048
try runManyWrites(

‎Benchmarks/Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.9
1+
// swift-tools-version:5.10
22

33
import PackageDescription
44

@@ -14,7 +14,7 @@ let package = Package(
1414
],
1515
targets: [
1616
.executableTarget(
17-
name: "NIOSSHBenchmarks",
17+
name: "NIOSSLBenchmarks",
1818
dependencies: [
1919
.product(name: "Benchmark", package: "package-benchmark"),
2020
.product(name: "NIOSSL", package: "swift-nio-ssl"),

‎Benchmarks/Thresholds/5.10/NIOSSHBenchmarks.SimpleHandshake.p90.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"mallocCountTotal" : 637000
3-
}
2+
"mallocCountTotal": 629000
3+
}

‎Benchmarks/Thresholds/5.9/NIOSSHBenchmarks.ManyWrites.p90.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Benchmarks/Thresholds/5.9/NIOSSHBenchmarks.SimpleHandshake.p90.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Benchmarks/Thresholds/6.0/NIOSSHBenchmarks.SimpleHandshake.p90.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"mallocCountTotal" : 636000
3-
}
2+
"mallocCountTotal": 628000
3+
}

‎Benchmarks/Thresholds/6.1/NIOSSHBenchmarks.ManyWrites.p90.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"mallocCountTotal" : 201947
3+
}

‎Benchmarks/Thresholds/6.1/NIOSSHBenchmarks.SimpleHandshake.p90.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"mallocCountTotal": 628000
3+
}

0 commit comments

Comments
 (0)