Skip to content

Commit 73b368e

Browse files
committed
more 6.0 nightly to 6.1 nightly CI changes
Motivation: Some changes were missed, passing through parameters for the new 6.1 version. Modifications: Pass through more parameters, clean up misleading comments. Result: 6.1 nightly runs will be more like 6.0 nightly runs were
1 parent 5595698 commit 73b368e

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

.github/workflows/benchmarks.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ on:
2424
default: true
2525
linux_nightly_6_0_enabled:
2626
type: boolean
27-
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
27+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
28+
default: false
29+
linux_nightly_6_1_enabled:
30+
type: boolean
31+
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
2832
default: true
2933
linux_nightly_main_enabled:
3034
type: boolean
@@ -33,15 +37,15 @@ on:
3337

3438
windows_6_0_enabled:
3539
type: boolean
36-
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
40+
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking
3741
default: false
3842
windows_nightly_6_0_enabled:
3943
type: boolean
40-
description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
44+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows benchmarking
4145
default: false
4246
windows_nightly_main_enabled:
4347
type: boolean
44-
description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
48+
description: "Boolean to enable the Windows nightly main Swift version matrix job. Currently has no effect!" # TODO: implement Windows benchmarking
4549
default: false
4650

4751
jobs:
@@ -63,7 +67,7 @@ jobs:
6367
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
6468
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
6569
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
66-
MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
70+
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
6771
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
6872

6973
benchmarks:

.github/workflows/cxx_interop.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
description: "Boolean to enable the Linux 6.0 Swift version matrix job. Defaults to true."
1717
default: true
1818
linux_nightly_6_0_enabled:
19+
type: boolean
20+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
21+
default: false
22+
linux_nightly_6_1_enabled:
1923
type: boolean
2024
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
2125
default: true
@@ -30,7 +34,7 @@ on:
3034
default: false
3135
windows_nightly_6_0_enabled:
3236
type: boolean
33-
description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to false. Currently has no effect!" # TODO: implement Windows Cxx compat checking
37+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly." # TODO: implement Windows Cxx compat checking
3438
default: false
3539
windows_nightly_main_enabled:
3640
type: boolean
@@ -56,7 +60,7 @@ jobs:
5660
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
5761
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
5862
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
59-
MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
63+
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
6064
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
6165

6266
cxx-interop:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1616
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1717
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
18-
linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
18+
linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1919
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2020

2121
cxx-interop:

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2020
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2121
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
22-
linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
22+
linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2323
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2424

2525
benchmarks:

0 commit comments

Comments
 (0)