22
22
linux_swift_versions :
23
23
type : string
24
24
description : " Include Linux Swift version list (JSON)"
25
- default : " [ \" 5.9\" , \" 5.10\" , \" 6.0\" , \" 6.1\" , \" nightly-main\" , \" nightly-6.1 \" , \" nightly-6. 2\" ]"
25
+ default : " [ \" 5.9\" , \" 5.10\" , \" 6.0\" , \" 6.1\" , \" nightly-main\" , \" nightly-6.2\" ]"
26
26
linux_exclude_swift_versions :
27
27
type : string
28
28
description : " Exclude Linux Swift version list (JSON)"
34
34
windows_swift_versions :
35
35
type : string
36
36
description : " Include Windows Swift version list (JSON)"
37
- default : " [\" 5.9\" , \" 6.0\" , \" 6.1\" , \" nightly\" , \" nightly-6.1 \" ]"
37
+ default : " [\" 5.9\" , \" 6.0\" , \" 6.1\" , \" nightly\" , \" nightly-6.2 \" ]"
38
38
windows_exclude_swift_versions :
39
39
type : string
40
40
description : " Exclude Windows Swift version list (JSON)"
@@ -176,9 +176,9 @@ jobs:
176
176
run : ${{ inputs.linux_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
177
177
178
178
windows-build :
179
- name : Windows (${{ matrix.swift_version }} - ${{ inputs.enable_windows_docker && contains(matrix.swift_version, 'nightly') && ' windows-2019' || 'windows- 2022' }} )
179
+ name : Windows (${{ matrix.swift_version }} - windows-2022)
180
180
if : ${{ inputs.enable_windows_checks }}
181
- runs-on : ${{ inputs.enable_windows_docker && contains(matrix.swift_version, 'nightly') && ' windows-2019' || 'windows- 2022' }}
181
+ runs-on : windows-2022
182
182
strategy :
183
183
fail-fast : false
184
184
matrix :
@@ -204,7 +204,7 @@ jobs:
204
204
if : ${{ inputs.enable_windows_docker }}
205
205
run : |
206
206
if ("${{ matrix.swift_version }}".Contains("nightly")) {
207
- $Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-1809 "
207
+ $Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022 "
208
208
} else {
209
209
$Image = "swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022"
210
210
}
0 commit comments