Skip to content

Commit a8bdf99

Browse files
authored
Enable Swift 6.2 jobs in CI (#199)
Motivation: Swift 6.2 has been released, we should add it to our CI coverage. Modifications: Add additional Swift 6.2 jobs where appropriate in main.yml, pull_request.yml Result: Improved test coverage.
1 parent 7ddabf8 commit a8bdf99

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
1515
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
1616
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
17+
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
1718
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
1819
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
1920

.github/workflows/pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
2020
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
2121
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
22+
linux_6_2_arguments_override: "--explicit-target-dependency-import-check error"
2223
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
2324
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2425

.github/workflows/release_builds.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ on:
3535
type: string
3636
description: "The arguments passed to swift build in the Linux 6.1 Swift version matrix job."
3737
default: ""
38+
linux_6_2_enabled:
39+
type: boolean
40+
description: "Boolean to enable the Linux 6.2 Swift version matrix job. Defaults to true."
41+
default: true
42+
linux_6_2_arguments_override:
43+
type: string
44+
description: "The arguments passed to swift build in the Linux 6.2 Swift version matrix job."
45+
default: ""
3846
linux_nightly_next_enabled:
3947
type: boolean
4048
description: "Boolean to enable the Linux nightly next Swift version matrix job. Defaults to true."
@@ -73,8 +81,11 @@ jobs:
7381
- image: "swift:6.1-jammy"
7482
swift_version: "6.1"
7583
enabled: ${{ inputs.linux_6_1_enabled }}
76-
- image: "swiftlang/swift:nightly-6.1-jammy"
77-
swift_version: "nightly-6.1"
84+
- image: "swift:6.2-noble"
85+
swift_version: "6.2"
86+
enabled: ${{ inputs.linux_6_2_enabled }}
87+
- image: "swiftlang/swift:nightly-6.2-jammy"
88+
swift_version: "nightly-next"
7889
enabled: ${{ inputs.linux_nightly_next_enabled }}
7990
- image: "swiftlang/swift:nightly-main-jammy"
8091
swift_version: "nightly-main"
@@ -99,6 +110,7 @@ jobs:
99110
COMMAND_OVERRIDE_5_10: "swift build -c release ${{ inputs.linux_5_10_arguments_override }}"
100111
COMMAND_OVERRIDE_6_0: "swift build -c release ${{ inputs.linux_6_0_arguments_override }}"
101112
COMMAND_OVERRIDE_6_1: "swift build -c release ${{ inputs.linux_6_1_arguments_override }}"
113+
COMMAND_OVERRIDE_6_2: "swift build -c release ${{ inputs.linux_6_2_arguments_override }}"
102114
COMMAND_OVERRIDE_NIGHTLY_NEXT: "swift build -c release ${{ inputs.linux_nightly_next_arguments_override }}"
103115
COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift build -c release ${{ inputs.linux_nightly_main_arguments_override }}"
104116
run: |

.github/workflows/unit_tests.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ on:
3535
type: string
3636
description: "The arguments passed to swift test in the Linux 6.1 Swift version matrix job."
3737
default: ""
38+
linux_6_2_enabled:
39+
type: boolean
40+
description: "Boolean to enable the Linux 6.2 Swift version matrix job. Defaults to true."
41+
default: true
42+
linux_6_2_arguments_override:
43+
type: string
44+
description: "The arguments passed to swift test in the Linux 6.2 Swift version matrix job."
45+
default: ""
3846
linux_nightly_next_enabled:
3947
type: boolean
4048
description: "Boolean to enable the Linux nightly next Swift version matrix job. Defaults to true."
@@ -73,8 +81,11 @@ jobs:
7381
- image: "swift:6.1-jammy"
7482
swift_version: "6.1"
7583
enabled: ${{ inputs.linux_6_1_enabled }}
76-
- image: "swiftlang/swift:nightly-6.1-jammy"
77-
swift_version: "nightly-6.1"
84+
- image: "swift:6.2-jammy"
85+
swift_version: "6.2"
86+
enabled: ${{ inputs.linux_6_2_enabled }}
87+
- image: "swiftlang/swift:nightly-6.2-jammy"
88+
swift_version: "nightly-next"
7889
enabled: ${{ inputs.linux_nightly_next_enabled }}
7990
- image: "swiftlang/swift:nightly-main-jammy"
8091
swift_version: "nightly-main"
@@ -99,6 +110,7 @@ jobs:
99110
COMMAND_OVERRIDE_5_10: "swift test ${{ inputs.linux_5_10_arguments_override }}"
100111
COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
101112
COMMAND_OVERRIDE_6_1: "swift test ${{ inputs.linux_6_1_arguments_override }}"
113+
COMMAND_OVERRIDE_6_2: "swift test ${{ inputs.linux_6_2_arguments_override }}"
102114
COMMAND_OVERRIDE_NIGHTLY_NEXT: "swift test ${{ inputs.linux_nightly_next_arguments_override }}"
103115
COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
104116
run: |

0 commit comments

Comments
 (0)