From 4dcb63190bf74ad2cf21adc235a4db62a3d78c49 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 13 Feb 2022 22:47:06 -0800 Subject: [PATCH 1/3] Trying another way of adding windows-2022 C++20 --- .github/workflows/ci.yml | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b38d228353..629879a5bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -852,6 +852,51 @@ jobs: - name: Run all checks run: cmake --build build -t check + windows-2022: + strategy: + fail-fast: false + matrix: + python: + - 3.9 + + name: "🐍 ${{ matrix.python }} • MSVC 2022 C++20 • x64" + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v2 + + - name: Setup Python ${{ matrix.python }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + + - name: Prepare env + run: | + python3 -m pip install -r tests/requirements.txt + + - name: Update CMake + uses: jwlawson/actions-setup-cmake@v1.12 + + - name: Configure C++20 + run: > + cmake -S . -B build + -DPYBIND11_WERROR=ON + -DDOWNLOAD_CATCH=ON + -DDOWNLOAD_EIGEN=OFF + -DCMAKE_CXX_STANDARD=20 + + - name: Build C++20 + run: cmake --build build -j 2 + + - name: Python tests + run: cmake --build build --target pytest + + - name: C++20 tests + run: cmake --build build --target cpptest -j 2 + + - name: Interface test C++20 + run: cmake --build build --target test_cmake_build + mingw: name: "🐍 3 • windows-latest • ${{ matrix.sys }}" runs-on: windows-latest From b158a1b79f69a43478dce5b89702858ad5952386 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 14 Feb 2022 11:21:42 -0500 Subject: [PATCH 2/3] ci: try merging 2019 & 2022 --- .github/workflows/ci.yml | 55 +++++++--------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 629879a5bd..60001135c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -709,15 +709,22 @@ jobs: - 3.7 - 3.8 - 3.9 + year: + - 2019 include: - python: 3.9 + year: 2019 args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF - python: 3.8 + year: 2019 args: -DCMAKE_CXX_STANDARD=17 + - python: 3.9 + year: 2022 + args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF - name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}" - runs-on: windows-latest + name: "🐍 ${{ matrix.python }} • MSVC ${{ matrix.year }} • x86 ${{ matrix.args }}" + runs-on: windows-${{ matrix.year }} steps: - uses: actions/checkout@v2 @@ -852,50 +859,6 @@ jobs: - name: Run all checks run: cmake --build build -t check - windows-2022: - strategy: - fail-fast: false - matrix: - python: - - 3.9 - - name: "🐍 ${{ matrix.python }} • MSVC 2022 C++20 • x64" - runs-on: windows-2022 - - steps: - - uses: actions/checkout@v2 - - - name: Setup Python ${{ matrix.python }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python }} - - - name: Prepare env - run: | - python3 -m pip install -r tests/requirements.txt - - - name: Update CMake - uses: jwlawson/actions-setup-cmake@v1.12 - - - name: Configure C++20 - run: > - cmake -S . -B build - -DPYBIND11_WERROR=ON - -DDOWNLOAD_CATCH=ON - -DDOWNLOAD_EIGEN=OFF - -DCMAKE_CXX_STANDARD=20 - - - name: Build C++20 - run: cmake --build build -j 2 - - - name: Python tests - run: cmake --build build --target pytest - - - name: C++20 tests - run: cmake --build build --target cpptest -j 2 - - - name: Interface test C++20 - run: cmake --build build --target test_cmake_build mingw: name: "🐍 3 • windows-latest • ${{ matrix.sys }}" From 11caa15f3add738d75e64a209f0cbb0ea14c82c7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 14 Feb 2022 11:33:03 -0500 Subject: [PATCH 3/3] Revert "ci: try merging 2019 & 2022" This reverts commit b158a1b79f69a43478dce5b89702858ad5952386. --- .github/workflows/ci.yml | 55 +++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60001135c2..629879a5bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -709,22 +709,15 @@ jobs: - 3.7 - 3.8 - 3.9 - year: - - 2019 include: - python: 3.9 - year: 2019 args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF - python: 3.8 - year: 2019 args: -DCMAKE_CXX_STANDARD=17 - - python: 3.9 - year: 2022 - args: -DCMAKE_CXX_STANDARD=20 -DDOWNLOAD_EIGEN=OFF - name: "🐍 ${{ matrix.python }} • MSVC ${{ matrix.year }} • x86 ${{ matrix.args }}" - runs-on: windows-${{ matrix.year }} + name: "🐍 ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}" + runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -859,6 +852,50 @@ jobs: - name: Run all checks run: cmake --build build -t check + windows-2022: + strategy: + fail-fast: false + matrix: + python: + - 3.9 + + name: "🐍 ${{ matrix.python }} • MSVC 2022 C++20 • x64" + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v2 + + - name: Setup Python ${{ matrix.python }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} + + - name: Prepare env + run: | + python3 -m pip install -r tests/requirements.txt + + - name: Update CMake + uses: jwlawson/actions-setup-cmake@v1.12 + + - name: Configure C++20 + run: > + cmake -S . -B build + -DPYBIND11_WERROR=ON + -DDOWNLOAD_CATCH=ON + -DDOWNLOAD_EIGEN=OFF + -DCMAKE_CXX_STANDARD=20 + + - name: Build C++20 + run: cmake --build build -j 2 + + - name: Python tests + run: cmake --build build --target pytest + + - name: C++20 tests + run: cmake --build build --target cpptest -j 2 + + - name: Interface test C++20 + run: cmake --build build --target test_cmake_build mingw: name: "🐍 3 • windows-latest • ${{ matrix.sys }}"