ci: avoid brownout (and removal) of windows-2019 (#5712)

* ci: avoid brownout (and removal) of windows-2019

* Drop 2019 or update to 2022/latest
This commit is contained in:
Henry Schreiner
2025-06-03 13:06:20 -04:00
committed by GitHub
parent 0985052ad6
commit d4d2ec1ad8
2 changed files with 10 additions and 19 deletions

View File

@@ -118,7 +118,7 @@ jobs:
- runs-on: macos-latest - runs-on: macos-latest
python-version: 'graalpy-24.2' python-version: 'graalpy-24.2'
- runs-on: windows-2019 - runs-on: windows-latest
python-version: '3.9' python-version: '3.9'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON
- runs-on: windows-2022 - runs-on: windows-2022
@@ -819,20 +819,16 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python:
- '3.8'
- '3.10'
- '3.13'
include: include:
- python: '3.10'
args: -DCMAKE_CXX_STANDARD=20
- python: '3.8' - python: '3.8'
args: -DCMAKE_CXX_STANDARD=17 args: -DCMAKE_CXX_STANDARD=17
- python: '3.10'
args: -DCMAKE_CXX_STANDARD=20
- python: '3.13'
name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}" name: "🐍 ${{ matrix.python }} • MSVC 2022 • x86 ${{ matrix.args }}"
runs-on: windows-2019 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -855,11 +851,10 @@ jobs:
run: | run: |
python -m pip install -r tests/requirements.txt python -m pip install -r tests/requirements.txt
# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }} - name: Configure ${{ matrix.args }}
run: > run: >
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32 -G "Visual Studio 17 2022" -A Win32
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
@@ -881,8 +876,8 @@ jobs:
- python: 3.8 - python: 3.8
args: -DCMAKE_CXX_STANDARD=17 args: -DCMAKE_CXX_STANDARD=17
name: "🐍 ${{ matrix.python }} • MSVC 2019 (Debug) • x86 ${{ matrix.args }}" name: "🐍 ${{ matrix.python }} • MSVC 2022 (Debug) • x86 ${{ matrix.args }}"
runs-on: windows-2019 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -905,11 +900,10 @@ jobs:
run: | run: |
python -m pip install -r tests/requirements.txt python -m pip install -r tests/requirements.txt
# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }} - name: Configure ${{ matrix.args }}
run: > run: >
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32 -G "Visual Studio 17 2022" -A Win32
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON

View File

@@ -41,9 +41,6 @@ jobs:
- runs-on: macos-14 - runs-on: macos-14
cmake: "4.0" cmake: "4.0"
- runs-on: windows-2019
cmake: "3.18"
- runs-on: windows-latest - runs-on: windows-latest
cmake: "4.0" cmake: "4.0"