mirror of https://github.com/pybind/pybind11.git
135 lines
5.0 KiB
Diff
135 lines
5.0 KiB
Diff
--- ci.yml 2021-07-10 10:55:33.768884147 -0700
|
|
+++ ci_sh_def.yml 2021-07-10 10:56:02.326861782 -0700
|
|
@@ -1,4 +1,16 @@
|
|
-name: CI-SH-AVL
|
|
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
|
|
+# ci.yml
|
|
+# ci_sh_def.yml
|
|
+# ci_sh_def.yml.patch
|
|
+# To import changes made to ci.yml *** ESPECIALLY AFTER `git merge master` ***:
|
|
+# patch -i ci_sh_def.yml.patch -o ci_sh_def.yml
|
|
+# To update the patch file after making changes to ci_sh.yml:
|
|
+# diff -u ci.yml ci_sh_def.yml > ci_sh_def.yml.patch
|
|
+# git commit -a -m 'Tracking ci.yml changes from master.'
|
|
+#
|
|
+# Thanks a lot to @rhaschke for PR #2930!
|
|
+
|
|
+name: "CI-SH-DEF"
|
|
|
|
on:
|
|
workflow_dispatch:
|
|
@@ -104,6 +116,7 @@
|
|
-DDOWNLOAD_CATCH=OFF
|
|
-DDOWNLOAD_EIGEN=ON
|
|
-DCMAKE_CXX_STANDARD=11
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
|
|
${{ matrix.args }}
|
|
|
|
- name: Build C++11
|
|
@@ -131,6 +144,7 @@
|
|
-DDOWNLOAD_CATCH=OFF
|
|
-DDOWNLOAD_EIGEN=ON
|
|
-DCMAKE_CXX_STANDARD=17
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
|
|
${{ matrix.args }}
|
|
${{ matrix.args2 }}
|
|
|
|
@@ -287,6 +301,7 @@
|
|
-DPYBIND11_WERROR=ON
|
|
-DDOWNLOAD_CATCH=ON
|
|
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
- name: Build
|
|
@@ -316,7 +331,8 @@
|
|
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
|
|
|
|
- name: Configure
|
|
- run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
|
|
+ run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
+
|
|
|
|
- name: Build
|
|
run: cmake --build build -j2 --verbose
|
|
@@ -396,7 +412,7 @@
|
|
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
|
|
-DCMAKE_CXX_STANDARD=11 \
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
|
|
- -DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0" \
|
|
+ -DCMAKE_CXX_FLAGS="-Wc,--pending_instantiations=0 -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
|
|
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"
|
|
|
|
# Building before installing Pip should produce a warning but not an error
|
|
@@ -455,6 +471,7 @@
|
|
-DPYBIND11_WERROR=ON
|
|
-DDOWNLOAD_CATCH=ON
|
|
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
- name: Build
|
|
@@ -510,6 +527,7 @@
|
|
-DDOWNLOAD_CATCH=ON \
|
|
-DDOWNLOAD_EIGEN=OFF \
|
|
-DCMAKE_CXX_STANDARD=11 \
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
|
|
-DCMAKE_CXX_COMPILER=$(which icpc) \
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
@@ -542,6 +560,7 @@
|
|
-DDOWNLOAD_CATCH=ON \
|
|
-DDOWNLOAD_EIGEN=OFF \
|
|
-DCMAKE_CXX_STANDARD=17 \
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
|
|
-DCMAKE_CXX_COMPILER=$(which icpc) \
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
@@ -612,6 +631,7 @@
|
|
-DDOWNLOAD_CATCH=ON
|
|
-DDOWNLOAD_EIGEN=ON
|
|
-DCMAKE_CXX_STANDARD=11
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
- name: Build
|
|
@@ -662,6 +682,7 @@
|
|
cmake ../pybind11-tests
|
|
-DDOWNLOAD_CATCH=ON
|
|
-DPYBIND11_WERROR=ON
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
working-directory: /build-tests
|
|
|
|
@@ -757,6 +778,7 @@
|
|
-DPYBIND11_WERROR=ON
|
|
-DDOWNLOAD_CATCH=OFF
|
|
-DDOWNLOAD_EIGEN=ON
|
|
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
${{ matrix.args }}
|
|
- name: Build C++11
|
|
run: cmake --build build -j 2
|
|
@@ -803,6 +825,7 @@
|
|
-DPYBIND11_WERROR=ON
|
|
-DDOWNLOAD_CATCH=OFF
|
|
-DDOWNLOAD_EIGEN=ON
|
|
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
|
|
- name: Build C++14
|
|
run: cmake --build build -j 2
|
|
@@ -823,12 +846,13 @@
|
|
- 3.7
|
|
std:
|
|
- 14
|
|
+ args: [ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" ]
|
|
|
|
include:
|
|
- python: 2.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
|