Tracking ci.yml changes from master.

This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-07-11 00:46:36 -07:00
parent d6ca5f8cab
commit d3cfcdff9a
2 changed files with 19 additions and 19 deletions

View File

@@ -1,5 +1,5 @@
--- ci.yml 2021-07-10 10:55:33.768884147 -0700
+++ ci_sh_def.yml 2021-07-10 10:56:02.326861782 -0700
--- ci.yml 2021-07-11 00:44:59.934547958 -0700
+++ ci_sh_def.yml 2021-07-11 00:45:29.964628911 -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=OFF
-DDOWNLOAD_CATCH=ON
-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=OFF
-DDOWNLOAD_CATCH=ON
-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=OFF
-DDOWNLOAD_CATCH=ON
-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=OFF
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"