GHA - drop windows-2019 image testing

The windows-2019 image with Visual Studio 2019 support is ending,
see https://github.com/actions/runner-images/issues/12045.
Switch to latest windows-2025. The windows-2022 and windows-2025
images have the same version of Visual Studio installed (and just
about everything else), so just use the windows-2025 image.
This commit is contained in:
William S Fulton 2025-06-25 08:12:21 +01:00
parent 2e363dc8b2
commit 64fcc45920
2 changed files with 4 additions and 11 deletions

View File

@ -26,9 +26,7 @@ jobs:
matrix:
include:
- VER: '17 2022'
os: 'windows-2022'
- VER: '16 2019'
os: 'windows-2019'
os: 'windows-2025'
env:
BUILD_SYS: Visual Studio ${{ matrix.VER }}

View File

@ -23,8 +23,8 @@ jobs:
# but it won't fail the overall tests
continue-on-error: ${{ matrix.continue-on-error || false }}
# https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md
runs-on: ${{ matrix.os || 'windows-2022' }}
# https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md
runs-on: ${{ matrix.os || 'windows-2025' }}
# The name of the test follow the tested language
name: >
@ -38,14 +38,9 @@ jobs:
include:
- SWIGLANG: csharp
INSTALL: 'true'
- SWIGLANG: csharp
os: 'windows-2019'
- SWIGLANG: csharp
COMPILER: gcc
- SWIGLANG: csharp
INSTALL: 'true'
COMPILER: gcc
os: 'windows-2019'
- SWIGLANG: java
VER: 8
- SWIGLANG: java
@ -122,7 +117,7 @@ jobs:
- name: Install CCache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ matrix.os || 'windows-2022' }}-${{ matrix.COMPILER || 'msvc' }}
key: ${{ matrix.os || 'windows-2025' }}-${{ matrix.COMPILER || 'msvc' }}
- name: Install NuGet Packages
if: ${{ env.COMPILER == '' }}