Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- runs-on: macos-latest
python-version: 'graalpy-24.2'

- runs-on: windows-2019
- runs-on: windows-latest
python-version: '3.9'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON
- runs-on: windows-2022
Expand Down Expand Up @@ -819,20 +819,16 @@ jobs:
strategy:
fail-fast: false
matrix:
python:
- '3.8'
- '3.10'
- '3.13'

include:
- python: '3.10'
args: -DCMAKE_CXX_STANDARD=20
- python: '3.8'
args: -DCMAKE_CXX_STANDARD=17
- python: '3.10'
args: -DCMAKE_CXX_STANDARD=20
- python: '3.13'


name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"
runs-on: windows-2019
name: "🐍 ${{ matrix.python }} • MSVC 2022 • x86 ${{ matrix.args }}"
runs-on: windows-2022

steps:
- uses: actions/checkout@v4
Expand All @@ -855,11 +851,10 @@ jobs:
run: |
python -m pip install -r tests/requirements.txt

# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }}
run: >
cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32
-G "Visual Studio 17 2022" -A Win32
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
Expand All @@ -881,8 +876,8 @@ jobs:
- python: 3.8
args: -DCMAKE_CXX_STANDARD=17

name: "🐍 ${{ matrix.python }} • MSVC 2019 (Debug) • x86 ${{ matrix.args }}"
runs-on: windows-2019
name: "🐍 ${{ matrix.python }} • MSVC 2022 (Debug) • x86 ${{ matrix.args }}"
runs-on: windows-2022

steps:
- uses: actions/checkout@v4
Expand All @@ -905,11 +900,10 @@ jobs:
run: |
python -m pip install -r tests/requirements.txt

# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }}
run: >
cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32
-G "Visual Studio 17 2022" -A Win32
-DCMAKE_BUILD_TYPE=Debug
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ jobs:
- runs-on: macos-14
cmake: "4.0"

- runs-on: windows-2019
cmake: "3.18"

- runs-on: windows-latest
cmake: "4.0"

Expand Down
Loading