Rollback of DOWNLOAD_CATCH=OFF change merged via PR pybind#3059.

rwgk · Jul 11, 2021 · 0644e1b · 0644e1b
1 parent cf006af
commit 0644e1b
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,7 +100,7 @@ jobs:
       run: >
         cmake -S . -B .
         -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=OFF
+        -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         -DCMAKE_CXX_STANDARD=11
         ${{ matrix.args }}
@@ -111,10 +111,10 @@ jobs:
     - name: Python tests C++11
       run: cmake --build . --target pytest -j 2
 
-    #- name: C++11 tests
-    #  # 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'))"
-    #  run: cmake --build .  --target cpptest -j 2
+    - name: C++11 tests
+      # 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'))"
+      run: cmake --build .  --target cpptest -j 2
 
     - name: Interface test C++11
       run: cmake --build . --target test_cmake_build
@@ -127,7 +127,7 @@ jobs:
       run: >
         cmake -S . -B build2
         -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=OFF
+        -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         -DCMAKE_CXX_STANDARD=17
         ${{ matrix.args }}
@@ -139,10 +139,10 @@ jobs:
     - name: Python tests
       run: cmake --build build2 --target pytest
 
-    #- name: C++ tests
-    #  # 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'))"
-    #  run: cmake --build build2 --target cpptest
+    - name: C++ tests
+      # 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'))"
+      run: cmake --build build2 --target cpptest
 
     - name: Interface test
       run: cmake --build build2 --target test_cmake_build
@@ -754,7 +754,7 @@ jobs:
         cmake -S . -B build
         -G "Visual Studio 16 2019" -A Win32
         -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=OFF
+        -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         ${{ matrix.args }}
     - name: Build C++11
@@ -800,7 +800,7 @@ jobs:
         cmake -S . -B build
         -G "Visual Studio 14 2015" -A x64
         -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=OFF
+        -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
 
     - name: Build C++14
@@ -849,7 +849,7 @@ jobs:
         cmake -S . -B build
         -G "Visual Studio 15 2017" -A x64
         -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=OFF
+        -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
         -DCMAKE_CXX_STANDARD=${{ matrix.std }}
         ${{ matrix.args }}