Skip to content

Commit 60f808c

Browse files
committed
[CI] Update to Swift 6 CI
# Motivation We just updated our CI matrix in NIO to only support 5.9, 5.10 and 6. # Modification This PR updates the trigger files in this repo. Since this repo was always 5.9+ this is easy. # Result Up to date CI
1 parent 26547e7 commit 60f808c

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/pull_request.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,17 @@ on:
77
jobs:
88
soundness:
99
name: Soundness
10-
uses: apple/swift-nio/.github/workflows/soundness.yml@main
10+
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
1111
with:
12-
api_breakage_check_enabled: true
13-
broken_symlink_check_enabled: true
14-
docs_check_enabled: true
15-
format_check_enabled: true
16-
license_header_check_enabled: true
1712
license_header_check_project_name: "SwiftOpenAPIGenerator"
18-
shell_check_enabled: true
19-
unacceptable_language_check_enabled: true
2013

2114
unit-tests:
2215
name: Unit tests
2316
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
2417
with:
25-
linux_5_8_enabled: false
2618
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
2719
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
20+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
2821
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
2922
linux_nightly_main_enabled: false
3023

@@ -34,7 +27,6 @@ jobs:
3427
with:
3528
name: "Integration test"
3629
matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && ./scripts/run-integration-test.sh"
37-
matrix_linux_5_8_enabled: false
3830
matrix_linux_nightly_main_enabled: false
3931

4032
swift-6-language-mode:

.github/workflows/scheduled.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
name: Unit tests
1010
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
1111
with:
12-
linux_5_8_enabled: false
1312
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
1413
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
14+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1515
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1616
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
1717

@@ -20,5 +20,4 @@ jobs:
2020
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
2121
with:
2222
name: "Integration test"
23-
matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && ./scripts/run-integration-test.sh"
24-
matrix_linux_5_8_enabled: false
23+
matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && ./scripts/run-integration-test.sh"

0 commit comments

Comments
 (0)