Tracking ci.yml changes from master.

This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-10-26 12:13:05 -07:00
parent 4958fd9aa1
commit 50a4ed2888
2 changed files with 68 additions and 61 deletions

View File

@@ -1,5 +1,5 @@
--- ci.yml 2021-10-11 13:18:34.061740320 -0700
+++ ci_sh_def.yml 2021-10-11 13:20:02.319713610 -0700
--- ci.yml 2021-10-26 12:10:34.834324858 -0700
+++ ci_sh_def.yml 2021-10-26 12:12:26.000136653 -0700
@@ -1,4 +1,16 @@
-name: CI-SH-AVL
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -18,7 +18,7 @@
on:
workflow_dispatch:
@@ -104,6 +116,7 @@
@@ -103,6 +115,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
@@ -26,7 +26,7 @@
${{ matrix.args }}
- name: Build C++11
@@ -131,6 +144,7 @@
@@ -130,6 +143,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
@@ -34,7 +34,7 @@
${{ matrix.args }}
${{ matrix.args2 }}
@@ -153,6 +167,7 @@
@@ -152,6 +166,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
@@ -42,7 +42,7 @@
-DPYBIND11_INTERNALS_VERSION=10000000
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
${{ matrix.args }}
@@ -251,6 +266,7 @@
@@ -252,6 +267,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=17
@@ -50,7 +50,7 @@
- name: Build
run: cmake --build build -j 2
@@ -305,6 +321,7 @@
@@ -306,6 +322,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -58,7 +58,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build
@@ -334,7 +351,8 @@
@@ -335,7 +352,8 @@
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
- name: Configure
@@ -68,7 +68,7 @@
- name: Build
run: cmake --build build -j2 --verbose
@@ -414,7 +432,7 @@
@@ -415,7 +433,7 @@
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
-DCMAKE_CXX_STANDARD=11 \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
@@ -77,7 +77,7 @@
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
# Building before installing Pip should produce a warning but not an error
@@ -473,6 +491,7 @@
@@ -474,6 +492,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -85,7 +85,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build
@@ -528,6 +547,7 @@
@@ -529,6 +548,7 @@
-DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=11 \
@@ -93,7 +93,7 @@
-DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -560,6 +580,7 @@
@@ -561,6 +581,7 @@
-DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=17 \
@@ -101,7 +101,7 @@
-DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
@@ -631,6 +652,7 @@
@@ -633,6 +654,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
@@ -109,7 +109,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build
@@ -681,6 +703,7 @@
@@ -683,6 +705,7 @@
cmake ../pybind11-tests
-DDOWNLOAD_CATCH=ON
-DPYBIND11_WERROR=ON
@@ -117,7 +117,7 @@
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
working-directory: /build-tests
@@ -776,6 +799,7 @@
@@ -778,6 +801,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
@@ -125,7 +125,7 @@
${{ matrix.args }}
- name: Build C++11
run: cmake --build build -j 2
@@ -822,6 +846,7 @@
@@ -825,6 +849,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
@@ -133,22 +133,21 @@
- name: Build C++14
run: cmake --build build -j 2
@@ -842,12 +867,13 @@
- 3.7
std:
- 14
+ args: [ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" ]
include:
@@ -850,11 +875,11 @@
- python: 2.7
std: 17
args: >
- -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
+ -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
- python: 3.7
std: 17
args: >
- -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR"
+ -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
steps:
- uses: actions/checkout@v2
@@ -914,7 +940,7 @@
@@ -923,7 +948,7 @@
- name: Configure C++11
# LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -157,7 +156,7 @@
- name: Build C++11
run: cmake --build build -j 2
@@ -932,7 +958,7 @@
@@ -941,7 +966,7 @@
run: git clean -fdx
- name: Configure C++14
@@ -166,7 +165,7 @@
- name: Build C++14
run: cmake --build build2 -j 2
@@ -950,7 +976,7 @@
@@ -959,7 +984,7 @@
run: git clean -fdx
- name: Configure C++17