Skip to content

Commit cfc0683

Browse files
rwgkrwgk
committed
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)
1 parent 854a95b commit cfc0683

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
run: >
102102
cmake -S . -B .
103103
-DPYBIND11_WERROR=ON
104-
-DDOWNLOAD_CATCH=ON
104+
-DDOWNLOAD_CATCH=OFF
105105
-DDOWNLOAD_EIGEN=ON
106106
-DCMAKE_CXX_STANDARD=11
107107
${{ matrix.args }}
@@ -112,10 +112,10 @@ jobs:
112112
- name: Python tests C++11
113113
run: cmake --build . --target pytest -j 2
114114

115-
- name: C++11 tests
116-
# TODO: Figure out how to load the DLL on Python 3.8+
117-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
118-
run: cmake --build . --target cpptest -j 2
115+
#- name: C++11 tests
116+
# # TODO: Figure out how to load the DLL on Python 3.8+
117+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
118+
# run: cmake --build . --target cpptest -j 2
119119

120120
- name: Interface test C++11
121121
run: cmake --build . --target test_cmake_build
@@ -128,7 +128,7 @@ jobs:
128128
run: >
129129
cmake -S . -B build2
130130
-DPYBIND11_WERROR=ON
131-
-DDOWNLOAD_CATCH=ON
131+
-DDOWNLOAD_CATCH=OFF
132132
-DDOWNLOAD_EIGEN=ON
133133
-DCMAKE_CXX_STANDARD=17
134134
${{ matrix.args }}
@@ -140,10 +140,10 @@ jobs:
140140
- name: Python tests
141141
run: cmake --build build2 --target pytest
142142

143-
- name: C++ tests
144-
# TODO: Figure out how to load the DLL on Python 3.8+
145-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
146-
run: cmake --build build2 --target cpptest
143+
#- name: C++ tests
144+
# # TODO: Figure out how to load the DLL on Python 3.8+
145+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
146+
# run: cmake --build build2 --target cpptest
147147

148148
- name: Interface test
149149
run: cmake --build build2 --target test_cmake_build
@@ -755,7 +755,7 @@ jobs:
755755
cmake -S . -B build
756756
-G "Visual Studio 16 2019" -A Win32
757757
-DPYBIND11_WERROR=ON
758-
-DDOWNLOAD_CATCH=ON
758+
-DDOWNLOAD_CATCH=OFF
759759
-DDOWNLOAD_EIGEN=ON
760760
${{ matrix.args }}
761761
- name: Build C++11
@@ -801,7 +801,7 @@ jobs:
801801
cmake -S . -B build
802802
-G "Visual Studio 14 2015" -A x64
803803
-DPYBIND11_WERROR=ON
804-
-DDOWNLOAD_CATCH=ON
804+
-DDOWNLOAD_CATCH=OFF
805805
-DDOWNLOAD_EIGEN=ON
806806
807807
- name: Build C++14
@@ -850,7 +850,7 @@ jobs:
850850
cmake -S . -B build
851851
-G "Visual Studio 15 2017" -A x64
852852
-DPYBIND11_WERROR=ON
853-
-DDOWNLOAD_CATCH=ON
853+
-DDOWNLOAD_CATCH=OFF
854854
-DDOWNLOAD_EIGEN=ON
855855
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
856856
${{ matrix.args }}

‎.github/workflows/ci_sh_def.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
run: >
114114
cmake -S . -B .
115115
-DPYBIND11_WERROR=ON
116-
-DDOWNLOAD_CATCH=ON
116+
-DDOWNLOAD_CATCH=OFF
117117
-DDOWNLOAD_EIGEN=ON
118118
-DCMAKE_CXX_STANDARD=11
119119
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@@ -125,10 +125,10 @@ jobs:
125125
- name: Python tests C++11
126126
run: cmake --build . --target pytest -j 2
127127

128-
- name: C++11 tests
129-
# TODO: Figure out how to load the DLL on Python 3.8+
130-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
131-
run: cmake --build . --target cpptest -j 2
128+
#- name: C++11 tests
129+
# # TODO: Figure out how to load the DLL on Python 3.8+
130+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
131+
# run: cmake --build . --target cpptest -j 2
132132

133133
- name: Interface test C++11
134134
run: cmake --build . --target test_cmake_build
@@ -141,7 +141,7 @@ jobs:
141141
run: >
142142
cmake -S . -B build2
143143
-DPYBIND11_WERROR=ON
144-
-DDOWNLOAD_CATCH=ON
144+
-DDOWNLOAD_CATCH=OFF
145145
-DDOWNLOAD_EIGEN=ON
146146
-DCMAKE_CXX_STANDARD=17
147147
-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@@ -154,10 +154,10 @@ jobs:
154154
- name: Python tests
155155
run: cmake --build build2 --target pytest
156156

157-
- name: C++ tests
158-
# TODO: Figure out how to load the DLL on Python 3.8+
159-
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
160-
run: cmake --build build2 --target cpptest
157+
#- name: C++ tests
158+
# # TODO: Figure out how to load the DLL on Python 3.8+
159+
# if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
160+
# run: cmake --build build2 --target cpptest
161161

162162
- name: Interface test
163163
run: cmake --build build2 --target test_cmake_build
@@ -776,7 +776,7 @@ jobs:
776776
cmake -S . -B build
777777
-G "Visual Studio 16 2019" -A Win32
778778
-DPYBIND11_WERROR=ON
779-
-DDOWNLOAD_CATCH=ON
779+
-DDOWNLOAD_CATCH=OFF
780780
-DDOWNLOAD_EIGEN=ON
781781
-DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
782782
${{ matrix.args }}
@@ -823,7 +823,7 @@ jobs:
823823
cmake -S . -B build
824824
-G "Visual Studio 14 2015" -A x64
825825
-DPYBIND11_WERROR=ON
826-
-DDOWNLOAD_CATCH=ON
826+
-DDOWNLOAD_CATCH=OFF
827827
-DDOWNLOAD_EIGEN=ON
828828
-DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
829829
@@ -874,7 +874,7 @@ jobs:
874874
cmake -S . -B build
875875
-G "Visual Studio 15 2017" -A x64
876876
-DPYBIND11_WERROR=ON
877-
-DDOWNLOAD_CATCH=ON
877+
-DDOWNLOAD_CATCH=OFF
878878
-DDOWNLOAD_EIGEN=ON
879879
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
880880
${{ matrix.args }}

‎.github/workflows/ci_sh_def.yml.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ci.yml 2021-06-19 15:52:36.772992808 -0700
2-
+++ ci_sh_def.yml 2021-06-19 15:55:28.236643785 -0700
1+
--- ci.yml 2021-06-24 12:00:18.912375553 -0700
2+
+++ ci_sh_def.yml 2021-06-24 12:01:31.101283417 -0700
33
@@ -1,4 +1,16 @@
44
-name: CI-SH-AVL
55
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -19,15 +19,15 @@
1919
on:
2020
workflow_dispatch:
2121
@@ -104,6 +116,7 @@
22-
-DDOWNLOAD_CATCH=ON
22+
-DDOWNLOAD_CATCH=OFF
2323
-DDOWNLOAD_EIGEN=ON
2424
-DCMAKE_CXX_STANDARD=11
2525
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
2626
${{ matrix.args }}
2727

2828
- name: Build C++11
2929
@@ -131,6 +144,7 @@
30-
-DDOWNLOAD_CATCH=ON
30+
-DDOWNLOAD_CATCH=OFF
3131
-DDOWNLOAD_EIGEN=ON
3232
-DCMAKE_CXX_STANDARD=17
3333
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
@@ -103,15 +103,15 @@
103103

104104
@@ -757,6 +778,7 @@
105105
-DPYBIND11_WERROR=ON
106-
-DDOWNLOAD_CATCH=ON
106+
-DDOWNLOAD_CATCH=OFF
107107
-DDOWNLOAD_EIGEN=ON
108108
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
109109
${{ matrix.args }}
110110
- name: Build C++11
111111
run: cmake --build build -j 2
112112
@@ -803,6 +825,7 @@
113113
-DPYBIND11_WERROR=ON
114-
-DDOWNLOAD_CATCH=ON
114+
-DDOWNLOAD_CATCH=OFF
115115
-DDOWNLOAD_EIGEN=ON
116116
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
117117

0 commit comments

Comments
 (0)