Skip to content

Commit 1e591b4

Browse files
authored
Update the Windows nightly docker image to 2022 (#137)
* Update the Windows nightly docker image to 2022 * Update swift version for nightly windows and linux testing * Update swift_package_test.yml
1 parent 46a8ae2 commit 1e591b4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/swift_package_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
linux_swift_versions:
2323
type: string
2424
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\"]"
2626
linux_exclude_swift_versions:
2727
type: string
2828
description: "Exclude Linux Swift version list (JSON)"
@@ -34,7 +34,7 @@ on:
3434
windows_swift_versions:
3535
type: string
3636
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\"]"
3838
windows_exclude_swift_versions:
3939
type: string
4040
description: "Exclude Windows Swift version list (JSON)"
@@ -176,9 +176,9 @@ jobs:
176176
run: ${{ inputs.linux_build_command }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
177177

178178
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)
180180
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
182182
strategy:
183183
fail-fast: false
184184
matrix:
@@ -204,7 +204,7 @@ jobs:
204204
if: ${{ inputs.enable_windows_docker }}
205205
run: |
206206
if ("${{ matrix.swift_version }}".Contains("nightly")) {
207-
$Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-1809"
207+
$Image = "swiftlang/swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022"
208208
} else {
209209
$Image = "swift:${{ matrix.swift_version }}-windowsservercore-ltsc2022"
210210
}

0 commit comments

Comments
 (0)