Skip to content

Commit 5595698

Browse files
rnrornro
authored
Update nightly CI pipelines to 6.1 instead of 6.0 (apple#3076)
### Motivation: Active development has moved to 6.1 so the Swift 6.0 nightlies no longer deliver much value. ### Modifications: * Deprecate 6.0 nightly CI configuration parameters * Introduce new 6.1 nightly CI configuration parameters * Update the matrix generation script to handle 6.1 ### Result: * No more nightly 6.0 CI, 6.1 nightlies are introduced. * Configuration for 6.0 nightlies no longer has any effect. * All repos are automatically opted-in to 6.1 nightly linux pipelines **even if they opted out of 6.0**.
1 parent e2bfe08 commit 5595698

File tree

2 files changed

+44
-28
lines changed

2 files changed

+44
-28
lines changed

‎.github/workflows/unit_tests.yml

+26-10
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,19 @@ on:
2929
default: ""
3030
linux_nightly_6_0_enabled:
3131
type: boolean
32-
description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
32+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
3333
default: true
3434
linux_nightly_6_0_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: "⚠️ Deprecated, we no longer run against 6.0 nightly."
37+
default: ""
38+
linux_nightly_6_1_enabled:
39+
type: boolean
40+
description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
41+
default: true
42+
linux_nightly_6_1_arguments_override:
43+
type: string
44+
description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
3745
default: ""
3846
linux_nightly_main_enabled:
3947
type: boolean
@@ -46,23 +54,31 @@ on:
4654

4755
windows_6_0_enabled:
4856
type: boolean
49-
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
57+
description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to false."
5058
default: false
5159
windows_6_0_arguments_override:
5260
type: string
5361
description: "The arguments passed to swift test in the Windows 6.0 Swift version matrix job."
5462
default: ""
5563
windows_nightly_6_0_enabled:
5664
type: boolean
57-
description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
65+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
5866
default: false
5967
windows_nightly_6_0_arguments_override:
6068
type: string
61-
description: "The arguments passed to swift test in the Windows nightly 6.0 Swift version matrix job."
69+
description: "⚠️ Deprecated, we no longer run against 6.0 nightly."
70+
default: ""
71+
windows_nightly_6_1_enabled:
72+
type: boolean
73+
description: "Boolean to enable the Windows nightly 6.1 Swift version matrix job. Defaults to false."
74+
default: false
75+
windows_nightly_6_1_arguments_override:
76+
type: string
77+
description: "The arguments passed to swift test in the Windows nightly 6.1 Swift version matrix job."
6278
default: ""
6379
windows_nightly_main_enabled:
6480
type: boolean
65-
description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
81+
description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to false."
6682
default: false
6783
windows_nightly_main_arguments_override:
6884
type: string
@@ -90,15 +106,15 @@ jobs:
90106
MATRIX_LINUX_5_10_COMMAND_ARGUMENTS: ${{ inputs.linux_5_10_arguments_override }}
91107
MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
92108
MATRIX_LINUX_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_6_0_arguments_override }}
93-
MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
94-
MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_0_arguments_override }}
109+
MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
110+
MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_1_arguments_override }}
95111
MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
96112
MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_main_arguments_override }}
97113
MATRIX_WINDOWS_COMMAND: "swift test"
98114
MATRIX_WINDOWS_6_0_ENABLED: ${{ inputs.windows_6_0_enabled }}
99115
MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_6_0_arguments_override }}
100-
MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED: ${{ inputs.windows_nightly_6_0_enabled }}
101-
MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_0_arguments_override }}
116+
MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED: ${{ inputs.windows_nightly_6_1_enabled }}
117+
MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_1_arguments_override }}
102118
MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
103119
MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}
104120

‎scripts/generate_matrix.sh

+18-18
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ linux_5_10_enabled="${MATRIX_LINUX_5_10_ENABLED:=true}"
2222
linux_5_10_command_arguments="$MATRIX_LINUX_5_10_COMMAND_ARGUMENTS"
2323
linux_6_0_enabled="${MATRIX_LINUX_6_0_ENABLED:=true}"
2424
linux_6_0_command_arguments="$MATRIX_LINUX_6_0_COMMAND_ARGUMENTS"
25-
linux_nightly_6_0_enabled="${MATRIX_LINUX_NIGHTLY_6_0_ENABLED:=true}"
26-
linux_nightly_6_0_command_arguments="$MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS"
25+
linux_nightly_6_1_enabled="${MATRIX_LINUX_NIGHTLY_6_1_ENABLED:=true}"
26+
linux_nightly_6_1_command_arguments="$MATRIX_LINUX_NIGHTLY_6_1_COMMAND_ARGUMENTS"
2727
linux_nightly_main_enabled="${MATRIX_LINUX_NIGHTLY_MAIN_ENABLED:=true}"
2828
linux_nightly_main_command_arguments="$MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
2929

3030
windows_command="$MATRIX_WINDOWS_COMMAND" # required if any Windows pipeline is enabled
3131
windows_setup_command="$MATRIX_WINDOWS_SETUP_COMMAND"
3232
windows_6_0_enabled="${MATRIX_WINDOWS_6_0_ENABLED:=false}"
3333
windows_6_0_command_arguments="$MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS"
34-
windows_nightly_6_0_enabled="${MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED:=false}"
35-
windows_nightly_6_0_command_arguments="$MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS"
34+
windows_nightly_6_1_enabled="${MATRIX_WINDOWS_NIGHTLY_6_1_ENABLED:=false}"
35+
windows_nightly_6_1_command_arguments="$MATRIX_WINDOWS_NIGHTLY_6_1_COMMAND_ARGUMENTS"
3636
windows_nightly_main_enabled="${MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED:=false}"
3737
windows_nightly_main_command_arguments="$MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
3838

@@ -41,13 +41,13 @@ linux_runner="ubuntu-latest"
4141
linux_5_9_container_image="swift:5.9-jammy"
4242
linux_5_10_container_image="swift:5.10-jammy"
4343
linux_6_0_container_image="swift:6.0-jammy"
44-
linux_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-jammy"
44+
linux_nightly_6_1_container_image="swiftlang/swift:nightly-6.1-jammy"
4545
linux_nightly_main_container_image="swiftlang/swift:nightly-main-jammy"
4646

4747
windows_6_0_runner="windows-2022"
4848
windows_6_0_container_image="swift:6.0-windowsservercore-ltsc2022"
49-
windows_nightly_6_0_runner="windows-2019"
50-
windows_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-windowsservercore-1809"
49+
windows_nightly_6_1_runner="windows-2019"
50+
windows_nightly_6_1_container_image="swiftlang/swift:nightly-6.1-windowsservercore-1809"
5151
windows_nightly_main_runner="windows-2019"
5252
windows_nightly_main_container_image="swiftlang/swift:nightly-main-windowsservercore-1809"
5353

@@ -56,7 +56,7 @@ matrix='{"config": []}'
5656

5757
## Linux
5858
if [[ "$linux_5_9_enabled" == "true" || "$linux_5_10_enabled" == "true" || "$linux_6_0_enabled" == "true" || \
59-
"$linux_nightly_6_0_enabled" == "true" || "$linux_nightly_main_enabled" == "true" ]]; then
59+
"$linux_nightly_6_1_enabled" == "true" || "$linux_nightly_main_enabled" == "true" ]]; then
6060
if [[ -z "$linux_command" ]]; then
6161
echo "No linux command defined"; exit 1
6262
fi
@@ -93,14 +93,14 @@ if [[ "$linux_6_0_enabled" == "true" ]]; then
9393
'.config[.config| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
9494
fi
9595

96-
if [[ "$linux_nightly_6_0_enabled" == "true" ]]; then
96+
if [[ "$linux_nightly_6_1_enabled" == "true" ]]; then
9797
matrix=$(echo "$matrix" | jq -c \
9898
--arg setup_command "$linux_setup_command" \
9999
--arg command "$linux_command" \
100-
--arg command_arguments "$linux_nightly_6_0_command_arguments" \
101-
--arg container_image "$linux_nightly_6_0_container_image" \
100+
--arg command_arguments "$linux_nightly_6_1_command_arguments" \
101+
--arg container_image "$linux_nightly_6_1_container_image" \
102102
--arg runner "$linux_runner" \
103-
'.config[.config| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
103+
'.config[.config| length] |= . + { "name": "nightly-6.1", "image": $container_image, "swift_version": "nightly-6.1", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
104104
fi
105105

106106
if [[ "$linux_nightly_main_enabled" == "true" ]]; then
@@ -114,7 +114,7 @@ if [[ "$linux_nightly_main_enabled" == "true" ]]; then
114114
fi
115115

116116
## Windows
117-
if [[ "$windows_6_0_enabled" == "true" || "$windows_nightly_6_0_enabled" == "true" || "$windows_nightly_main_enabled" == "true" ]]; then
117+
if [[ "$windows_6_0_enabled" == "true" || "$windows_nightly_6_1_enabled" == "true" || "$windows_nightly_main_enabled" == "true" ]]; then
118118
if [[ -z "$windows_command" ]]; then
119119
echo "No windows command defined"; exit 1
120120
fi
@@ -130,14 +130,14 @@ if [[ "$windows_6_0_enabled" == "true" ]]; then
130130
'.config[.config| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
131131
fi
132132

133-
if [[ "$windows_nightly_6_0_enabled" == "true" ]]; then
133+
if [[ "$windows_nightly_6_1_enabled" == "true" ]]; then
134134
matrix=$(echo "$matrix" | jq -c \
135135
--arg setup_command "$windows_setup_command" \
136136
--arg command "$windows_command" \
137-
--arg command_arguments "$windows_nightly_6_0_command_arguments" \
138-
--arg container_image "$windows_nightly_6_0_container_image" \
139-
--arg runner "$windows_nightly_6_0_runner" \
140-
'.config[.config| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
137+
--arg command_arguments "$windows_nightly_6_1_command_arguments" \
138+
--arg container_image "$windows_nightly_6_1_container_image" \
139+
--arg runner "$windows_nightly_6_1_runner" \
140+
'.config[.config| length] |= . + { "name": "nightly-6.1", "image": $container_image, "swift_version": "nightly-6.1", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
141141
fi
142142

143143
if [[ "$windows_nightly_main_enabled" == "true" ]]; then

0 commit comments

Comments
 (0)