Skip to content

Commit 9bde125

Browse files
committed
github/workflows: Use windows-latest runner for all Windows CI jobs.
The windows-2019 runner has been deprecated by GitHub, so stop using that. Also take the chance to stop using windows-2022 and just use windows-latest everywhere. Signed-off-by: Damien George <[email protected]>
1 parent ca80aab commit 9bde125

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

.github/workflows/ports_windows.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,36 @@ jobs:
2828
visualstudio: ['2017', '2019', '2022']
2929
include:
3030
- visualstudio: '2017'
31-
runner: windows-latest
3231
vs_version: '[15, 16)'
3332
- visualstudio: '2019'
34-
runner: windows-2019
3533
vs_version: '[16, 17)'
3634
- visualstudio: '2022'
37-
runner: windows-2022
3835
vs_version: '[17, 18)'
3936
# trim down the number of jobs in the matrix
4037
exclude:
4138
- variant: standard
4239
configuration: Debug
4340
- visualstudio: '2019'
4441
configuration: Debug
42+
runs-on: windows-latest
4543
env:
4644
CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
47-
runs-on: ${{ matrix.runner }}
4845
steps:
4946
- name: Install Visual Studio 2017
5047
if: matrix.visualstudio == '2017'
5148
run: |
5249
choco install visualstudio2017buildtools
5350
choco install visualstudio2017-workload-vctools
5451
choco install windows-sdk-8.1
52+
- name: Install Visual Studio 2019
53+
if: matrix.visualstudio == '2019'
54+
run: |
55+
choco install visualstudio2019buildtools
56+
choco install visualstudio2019-workload-vctools
57+
choco install windows-sdk-8.1
5558
- uses: microsoft/setup-msbuild@v2
5659
with:
5760
vs-version: ${{ matrix.vs_version }}
58-
- uses: actions/setup-python@v5
59-
if: matrix.runner == 'windows-2019'
60-
with:
61-
python-version: '3.9'
6261
- uses: actions/checkout@v4
6362
- name: Build mpy-cross.exe
6463
run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
@@ -103,7 +102,7 @@ jobs:
103102
env: i686
104103
- sys: mingw64
105104
env: x86_64
106-
runs-on: windows-2022
105+
runs-on: windows-latest
107106
env:
108107
CHERE_INVOKING: enabled_from_arguments
109108
defaults:

0 commit comments

Comments
 (0)