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 <damien@micropython.org>
This commit is contained in:
17
.github/workflows/ports_windows.yml
vendored
17
.github/workflows/ports_windows.yml
vendored
@@ -28,13 +28,10 @@ jobs:
|
|||||||
visualstudio: ['2017', '2019', '2022']
|
visualstudio: ['2017', '2019', '2022']
|
||||||
include:
|
include:
|
||||||
- visualstudio: '2017'
|
- visualstudio: '2017'
|
||||||
runner: windows-latest
|
|
||||||
vs_version: '[15, 16)'
|
vs_version: '[15, 16)'
|
||||||
- visualstudio: '2019'
|
- visualstudio: '2019'
|
||||||
runner: windows-2019
|
|
||||||
vs_version: '[16, 17)'
|
vs_version: '[16, 17)'
|
||||||
- visualstudio: '2022'
|
- visualstudio: '2022'
|
||||||
runner: windows-2022
|
|
||||||
vs_version: '[17, 18)'
|
vs_version: '[17, 18)'
|
||||||
# trim down the number of jobs in the matrix
|
# trim down the number of jobs in the matrix
|
||||||
exclude:
|
exclude:
|
||||||
@@ -42,9 +39,9 @@ jobs:
|
|||||||
configuration: Debug
|
configuration: Debug
|
||||||
- visualstudio: '2019'
|
- visualstudio: '2019'
|
||||||
configuration: Debug
|
configuration: Debug
|
||||||
|
runs-on: windows-latest
|
||||||
env:
|
env:
|
||||||
CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
|
CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
|
||||||
runs-on: ${{ matrix.runner }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install Visual Studio 2017
|
- name: Install Visual Studio 2017
|
||||||
if: matrix.visualstudio == '2017'
|
if: matrix.visualstudio == '2017'
|
||||||
@@ -52,13 +49,15 @@ jobs:
|
|||||||
choco install visualstudio2017buildtools
|
choco install visualstudio2017buildtools
|
||||||
choco install visualstudio2017-workload-vctools
|
choco install visualstudio2017-workload-vctools
|
||||||
choco install windows-sdk-8.1
|
choco install windows-sdk-8.1
|
||||||
|
- name: Install Visual Studio 2019
|
||||||
|
if: matrix.visualstudio == '2019'
|
||||||
|
run: |
|
||||||
|
choco install visualstudio2019buildtools
|
||||||
|
choco install visualstudio2019-workload-vctools
|
||||||
|
choco install windows-sdk-8.1
|
||||||
- uses: microsoft/setup-msbuild@v2
|
- uses: microsoft/setup-msbuild@v2
|
||||||
with:
|
with:
|
||||||
vs-version: ${{ matrix.vs_version }}
|
vs-version: ${{ matrix.vs_version }}
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
if: matrix.runner == 'windows-2019'
|
|
||||||
with:
|
|
||||||
python-version: '3.9'
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Build mpy-cross.exe
|
- name: Build mpy-cross.exe
|
||||||
run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
|
run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
|
||||||
@@ -103,7 +102,7 @@ jobs:
|
|||||||
env: i686
|
env: i686
|
||||||
- sys: mingw64
|
- sys: mingw64
|
||||||
env: x86_64
|
env: x86_64
|
||||||
runs-on: windows-2022
|
runs-on: windows-latest
|
||||||
env:
|
env:
|
||||||
CHERE_INVOKING: enabled_from_arguments
|
CHERE_INVOKING: enabled_from_arguments
|
||||||
defaults:
|
defaults:
|
||||||
|
|||||||
Reference in New Issue
Block a user