Skip to content

Commit e4a302f

Browse files
authored
Enable Swift 6.1 jobs in CI (#54)
Motivation: Swift 6.1 has been released, we should add it to our CI coverage. Modifications: Add additional Swift 6.1 jobs where appropriate in main.yml, pull_request.yml Result: Improved test coverage.
1 parent 7565a59 commit e4a302f

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ jobs:
1414
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
1515
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
1616
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
17+
linux_6_1_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"

.github/workflows/pull_request.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
1919
linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
2020
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
21+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
2122
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
2223
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2324

.github/workflows/unit_tests.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,21 @@ on:
2727
type: string
2828
description: "The arguments passed to swift test in the Linux 6.0 Swift version matrix job."
2929
default: ""
30+
linux_6_1_enabled:
31+
type: boolean
32+
description: "Boolean to enable the Linux 6.1 Swift version matrix job. Defaults to true."
33+
default: true
34+
linux_6_1_arguments_override:
35+
type: string
36+
description: "The arguments passed to swift test in the Linux 6.1 Swift version matrix job."
37+
default: ""
3038
linux_nightly_next_enabled:
3139
type: boolean
32-
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
40+
description: "Boolean to enable the Linux nightly next Swift version matrix job. Defaults to true."
3341
default: true
3442
linux_nightly_next_arguments_override:
3543
type: string
36-
description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
44+
description: "The arguments passed to swift test in the Linux nightly next Swift version matrix job."
3745
default: ""
3846
linux_nightly_main_enabled:
3947
type: boolean
@@ -62,6 +70,9 @@ jobs:
6270
- image: "swift:6.0-jammy"
6371
swift_version: "6.0"
6472
enabled: ${{ inputs.linux_6_0_enabled }}
73+
- image: "swift:6.1-jammy"
74+
swift_version: "6.1"
75+
enabled: ${{ inputs.linux_6_1_enabled }}
6576
- image: "swiftlang/swift:nightly-6.1-jammy"
6677
swift_version: "nightly-6.1"
6778
enabled: ${{ inputs.linux_nightly_next_enabled }}
@@ -87,6 +98,7 @@ jobs:
8798
COMMAND_OVERRIDE_5_9: "swift test ${{ inputs.linux_5_9_arguments_override }}"
8899
COMMAND_OVERRIDE_5_10: "swift test ${{ inputs.linux_5_10_arguments_override }}"
89100
COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
101+
COMMAND_OVERRIDE_6_1: "swift test ${{ inputs.linux_6_1_arguments_override }}"
90102
COMMAND_OVERRIDE_NIGHTLY_NEXT: "swift test ${{ inputs.linux_nightly_next_arguments_override }}"
91103
COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
92104
run: |

0 commit comments

Comments
 (0)