Skip to content

P
pybind11
Commit 0f4761b4 by Ralf W. Grosse-Kunstleve Committed by GitHub
Options

Rollback of DOWNLOAD_CATCH=OFF change merged via PR #3059. (#3092)

parent cf006af2
Showing with 13 additions and 13 deletions
.github/workflows/ci.yml
...@@ -100,7 +100,7 @@ jobs: ...@@ -100,7 +100,7 @@ jobs:
run: > run: >
cmake -S . -B . cmake -S . -B .
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD=11
${{ matrix.args }} ${{ matrix.args }}
...@@ -111,10 +111,10 @@ jobs: ...@@ -111,10 +111,10 @@ jobs:
- name: Python tests C++11 - name: Python tests C++11
run: cmake --build . --target pytest -j 2 run: cmake --build . --target pytest -j 2
#- name: C++11 tests - name: C++11 tests
# # TODO: Figure out how to load the DLL on Python 3.8+ # TODO: Figure out how to load the DLL on Python 3.8+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))" if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
# run: cmake --build . --target cpptest -j 2 run: cmake --build . --target cpptest -j 2
- name: Interface test C++11 - name: Interface test C++11
run: cmake --build . --target test_cmake_build run: cmake --build . --target test_cmake_build
...@@ -127,7 +127,7 @@ jobs: ...@@ -127,7 +127,7 @@ jobs:
run: > run: >
cmake -S . -B build2 cmake -S . -B build2
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17
${{ matrix.args }} ${{ matrix.args }}
...@@ -139,10 +139,10 @@ jobs: ...@@ -139,10 +139,10 @@ jobs:
- name: Python tests - name: Python tests
run: cmake --build build2 --target pytest run: cmake --build build2 --target pytest
#- name: C++ tests - name: C++ tests
# # TODO: Figure out how to load the DLL on Python 3.8+ # TODO: Figure out how to load the DLL on Python 3.8+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))" if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
# run: cmake --build build2 --target cpptest run: cmake --build build2 --target cpptest
- name: Interface test - name: Interface test
run: cmake --build build2 --target test_cmake_build run: cmake --build build2 --target test_cmake_build
...@@ -754,7 +754,7 @@ jobs: ...@@ -754,7 +754,7 @@ jobs:
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32 -G "Visual Studio 16 2019" -A Win32
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
${{ matrix.args }} ${{ matrix.args }}
- name: Build C++11 - name: Build C++11
...@@ -800,7 +800,7 @@ jobs: ...@@ -800,7 +800,7 @@ jobs:
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 14 2015" -A x64 -G "Visual Studio 14 2015" -A x64
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
- name: Build C++14 - name: Build C++14
...@@ -849,7 +849,7 @@ jobs: ...@@ -849,7 +849,7 @@ jobs:
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 15 2017" -A x64 -G "Visual Studio 15 2017" -A x64
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
${{ matrix.args }} ${{ matrix.args }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment