Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 07:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-07-11 00:40:38 -07:00 committed by GitHub
parent cf006af2f0
commit 0f4761b44a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/ci.yml vendored
View File

@ -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:
- 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:
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:
- 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:
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:
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:
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 }}