mirror of
https://github.com/pybind/pybind11.git
synced 2026-05-04 21:51:47 +00:00
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:
12
.github/workflows/ci_sh_def.yml.patch
vendored
12
.github/workflows/ci_sh_def.yml.patch
vendored
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user