Skip to content

Commit a36eac5

Browse files
authored
CI use 6.1 nightlies (#50)
CI use 6.1 nightlies now that Swift development is happening in the 6.1 branch
1 parent b015e64 commit a36eac5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Diff for: .github/workflows/pull_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +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_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
21+
linux_nightly_6_1_arguments_override: "--explicit-target-dependency-import-check error"
2222
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2323

2424
cxx-interop:

Diff for: .github/workflows/unit_tests.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ 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_nightly_6_0_enabled:
30+
linux_nightly_6_1_enabled:
3131
type: boolean
32-
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
32+
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
3333
default: true
34-
linux_nightly_6_0_arguments_override:
34+
linux_nightly_6_1_arguments_override:
3535
type: string
36-
description: "The arguments passed to swift test in the Linux nightly 6.0 Swift version matrix job."
36+
description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
3737
default: ""
3838
linux_nightly_main_enabled:
3939
type: boolean
@@ -46,7 +46,7 @@ on:
4646

4747
jobs:
4848
unit-tests:
49-
name: Unit tests
49+
name: Unit tests (${{ matrix.swift.swift_version }})
5050
runs-on: ubuntu-latest
5151
strategy:
5252
fail-fast: false
@@ -62,9 +62,9 @@ jobs:
6262
- image: "swift:6.0-jammy"
6363
swift_version: "6.0"
6464
enabled: ${{ inputs.linux_6_0_enabled }}
65-
- image: "swiftlang/swift:nightly-6.0-jammy"
66-
swift_version: "nightly-6.0"
67-
enabled: ${{ inputs.linux_nightly_6_0_enabled }}
65+
- image: "swiftlang/swift:nightly-6.1-jammy"
66+
swift_version: "nightly-6.1"
67+
enabled: ${{ inputs.linux_nightly_6_1_enabled }}
6868
- image: "swiftlang/swift:nightly-main-jammy"
6969
swift_version: "nightly-main"
7070
enabled: ${{ inputs.linux_nightly_main_enabled }}
@@ -87,7 +87,7 @@ jobs:
8787
COMMAND_OVERRIDE_5_9: "swift test ${{ inputs.linux_5_9_arguments_override }}"
8888
COMMAND_OVERRIDE_5_10: "swift test ${{ inputs.linux_5_10_arguments_override }}"
8989
COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
90-
COMMAND_OVERRIDE_NIGHTLY_6_0: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
90+
COMMAND_OVERRIDE_NIGHTLY_6_1: "swift test ${{ inputs.linux_nightly_6_1_arguments_override }}"
9191
COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
9292
run: |
9393
apt-get -qq update && apt-get -qq -y install curl

0 commit comments

Comments
 (0)