Temporarily using DOWNLOAD_CATCH=OFF for all Windows builds.

This also disables catch for some other builds that happen to be in the same
matrix. But there are still plenty of builds running with DOWNLOAD_CATCH=ON.

Workaround for a windows-only download issue that started yesterday (2020-06-23):

-- Downloading catch v2.13.2...
CMake Error at tools/FindCatch.cmake:40 (message):
  Could not download
  https://github.com/philsquared/Catch/releases/download/v2.13.2/catch.hpp
Call Stack (most recent call first):
  tools/FindCatch.cmake:59 (_download_catch)
  tests/pure_cpp/CMakeLists.txt:1 (find_package)
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-24 12:02:42 -07:00
parent 854a95b47d
commit cfc06838fd
3 changed files with 32 additions and 32 deletions

View File

@ -101,7 +101,7 @@ jobs:
run: >
cmake -S . -B .
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
${{ matrix.args }}
@ -112,10 +112,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
@ -128,7 +128,7 @@ jobs:
run: >
cmake -S . -B build2
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
${{ matrix.args }}
@ -140,10 +140,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
@ -755,7 +755,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
${{ matrix.args }}
- name: Build C++11
@ -801,7 +801,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 14 2015" -A x64
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
- name: Build C++14
@ -850,7 +850,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 15 2017" -A x64
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
${{ matrix.args }}

View File

@ -113,7 +113,7 @@ jobs:
run: >
cmake -S . -B .
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@ -125,10 +125,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
@ -141,7 +141,7 @@ jobs:
run: >
cmake -S . -B build2
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@ -154,10 +154,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
@ -776,7 +776,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
${{ matrix.args }}
@ -823,7 +823,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 14 2015" -A x64
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
@ -874,7 +874,7 @@ jobs:
cmake -S . -B build
-G "Visual Studio 15 2017" -A x64
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
${{ matrix.args }}

View File

@ -1,5 +1,5 @@
--- ci.yml 2021-06-19 15:52:36.772992808 -0700
+++ ci_sh_def.yml 2021-06-19 15:55:28.236643785 -0700
--- ci.yml 2021-06-24 12:00:18.912375553 -0700
+++ ci_sh_def.yml 2021-06-24 12:01:31.101283417 -0700
@@ -1,4 +1,16 @@
-name: CI-SH-AVL
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@ -19,7 +19,7 @@
on:
workflow_dispatch:
@@ -104,6 +116,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@ -27,7 +27,7 @@
- name: Build C++11
@@ -131,6 +144,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@ -103,7 +103,7 @@
@@ -757,6 +778,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
${{ matrix.args }}
@ -111,7 +111,7 @@
run: cmake --build build -j 2
@@ -803,6 +825,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"