Skip to content

Commit 8060681

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 dffd9d1 commit 8060681

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,16 @@ jobs:
99
name: Soundness
1010
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
1111
with:
12-
api_breakage_check_enabled: false
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
yamllint_check_enabled: false
2114

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

@@ -35,7 +28,6 @@ jobs:
3528
with:
3629
name: "Integration test"
3730
matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && SWIFT_OPENAPI_GENERATOR_REPO_URL=file://${GITHUB_WORKSPACE} ./scripts/run-integration-test.sh"
38-
matrix_linux_5_8_enabled: false
3931
matrix_linux_nightly_main_enabled: false
4032

4133
compatibility-test:
@@ -63,7 +55,6 @@ jobs:
6355
with:
6456
name: "Example packages"
6557
matrix_linux_command: "./scripts/test-examples.sh"
66-
matrix_linux_5_8_enabled: false
6758
matrix_linux_nightly_main_enabled: false
6859

6960
swift-6-language-mode:

.github/workflows/scheduled.yml

Lines changed: 1 addition & 3 deletions
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

@@ -21,12 +21,10 @@ jobs:
2121
with:
2222
name: "Integration test"
2323
matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && SWIFT_OPENAPI_GENERATOR_REPO_URL=file://${GITHUB_WORKSPACE} ./scripts/run-integration-test.sh"
24-
matrix_linux_5_8_enabled: false
2524

2625
example-packages:
2726
name: Example packages
2827
uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
2928
with:
3029
name: "Example packages"
3130
matrix_linux_command: "./scripts/test-examples.sh"
32-
matrix_linux_5_8_enabled: false

0 commit comments

Comments
 (0)