2022-07-21 13:55:23 +00:00
|
|
|
--- ci.yml 2022-07-21 06:53:22.850154382 -0700
|
|
|
|
+++ ci_sh_def.yml 2022-07-21 06:54:29.947056986 -0700
|
2021-06-19 22:56:08 +00:00
|
|
|
@@ -1,4 +1,16 @@
|
2021-10-27 17:55:24 +00:00
|
|
|
-name: CI
|
2021-04-20 21:34:31 +00:00
|
|
|
+# 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
|
2021-06-19 22:56:08 +00:00
|
|
|
+# git commit -a -m 'Tracking ci.yml changes from master.'
|
2021-04-20 21:34:31 +00:00
|
|
|
+#
|
|
|
|
+# Thanks a lot to @rhaschke for PR #2930!
|
|
|
|
+
|
|
|
|
+name: "CI-SH-DEF"
|
|
|
|
|
|
|
|
on:
|
|
|
|
workflow_dispatch:
|
2021-10-27 17:55:24 +00:00
|
|
|
@@ -11,7 +23,7 @@
|
|
|
|
- v*
|
|
|
|
|
|
|
|
concurrency:
|
|
|
|
- group: test-sh-avl${{ github.ref }}
|
|
|
|
+ group: test-sh-def-${{ github.ref }}
|
|
|
|
cancel-in-progress: true
|
|
|
|
|
|
|
|
env:
|
2022-07-10 04:50:08 +00:00
|
|
|
@@ -110,6 +122,7 @@
|
2021-07-11 07:46:36 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
2021-04-20 21:34:31 +00:00
|
|
|
-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
|
2022-07-10 04:50:08 +00:00
|
|
|
@@ -137,6 +150,7 @@
|
2021-07-11 07:46:36 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
2021-04-20 21:34:31 +00:00
|
|
|
-DDOWNLOAD_EIGEN=ON
|
|
|
|
-DCMAKE_CXX_STANDARD=17
|
|
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
|
|
|
|
${{ matrix.args }}
|
|
|
|
|
2021-12-03 19:12:53 +00:00
|
|
|
- name: Build
|
2022-07-10 04:50:08 +00:00
|
|
|
@@ -158,6 +172,7 @@
|
2021-09-20 13:01:58 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
|
|
|
-DDOWNLOAD_EIGEN=ON
|
|
|
|
-DCMAKE_CXX_STANDARD=17
|
|
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
|
|
|
|
-DPYBIND11_INTERNALS_VERSION=10000000
|
|
|
|
"-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
|
|
|
|
${{ matrix.args }}
|
2022-07-10 04:50:08 +00:00
|
|
|
@@ -245,6 +260,7 @@
|
2021-07-30 19:28:06 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
|
|
|
-DDOWNLOAD_EIGEN=ON
|
|
|
|
-DCMAKE_CXX_STANDARD=17
|
|
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
|
|
|
|
|
|
- name: Build
|
|
|
|
run: cmake --build build -j 2
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -307,6 +323,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -336,7 +353,8 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -416,7 +434,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -475,6 +493,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -530,6 +549,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-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)")
|
|
|
|
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -562,6 +582,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON \
|
|
|
|
-DDOWNLOAD_EIGEN=OFF \
|
2022-01-12 01:52:49 +00:00
|
|
|
-DCMAKE_CXX_STANDARD=17 \
|
2021-04-20 21:34:31 +00:00
|
|
|
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
|
|
|
|
-DCMAKE_CXX_COMPILER=$(which icpc) \
|
|
|
|
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
|
|
|
|
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -629,6 +650,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -679,6 +701,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
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
|
|
|
|
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -771,6 +794,7 @@
|
2021-04-20 21:34:31 +00:00
|
|
|
-DPYBIND11_WERROR=ON
|
2021-07-11 07:46:36 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
2021-04-20 21:34:31 +00:00
|
|
|
-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
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -825,6 +849,7 @@
|
2022-03-10 18:37:16 +00:00
|
|
|
-DPYBIND11_WERROR=ON
|
|
|
|
-DDOWNLOAD_CATCH=ON
|
|
|
|
-DDOWNLOAD_EIGEN=ON
|
|
|
|
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
|
|
${{ matrix.args }}
|
|
|
|
- name: Build C++11
|
|
|
|
run: cmake --build build --config Debug -j 2
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -865,6 +890,7 @@
|
2022-02-15 00:20:48 +00:00
|
|
|
-DDOWNLOAD_CATCH=ON
|
2022-02-16 15:17:51 +00:00
|
|
|
-DDOWNLOAD_EIGEN=ON
|
2022-02-15 00:20:48 +00:00
|
|
|
-DCMAKE_CXX_STANDARD=20
|
|
|
|
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
|
|
|
|
|
|
|
|
- name: Build C++20
|
|
|
|
run: cmake --build build -j 2
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -912,7 +938,7 @@
|
2021-08-26 22:03:41 +00:00
|
|
|
- name: Configure C++11
|
2021-07-30 18:37:51 +00:00
|
|
|
# LTO leads to many undefined reference like
|
|
|
|
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
|
2022-02-15 00:20:48 +00:00
|
|
|
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DDOWNLOAD_CATCH=ON -S . -B build
|
|
|
|
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build
|
2021-07-30 18:37:51 +00:00
|
|
|
|
2021-08-26 22:03:41 +00:00
|
|
|
- name: Build C++11
|
2021-07-30 18:37:51 +00:00
|
|
|
run: cmake --build build -j 2
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -930,7 +956,7 @@
|
2021-08-26 22:03:41 +00:00
|
|
|
run: git clean -fdx
|
|
|
|
|
|
|
|
- name: Configure C++14
|
2022-02-15 00:20:48 +00:00
|
|
|
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DDOWNLOAD_CATCH=ON -S . -B build2
|
|
|
|
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DDOWNLOAD_CATCH=O -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build2
|
2021-08-26 22:03:41 +00:00
|
|
|
|
|
|
|
- name: Build C++14
|
|
|
|
run: cmake --build build2 -j 2
|
2022-07-21 13:55:23 +00:00
|
|
|
@@ -948,7 +974,7 @@
|
2021-08-26 22:03:41 +00:00
|
|
|
run: git clean -fdx
|
|
|
|
|
|
|
|
- name: Configure C++17
|
2022-02-15 00:20:48 +00:00
|
|
|
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_CATCH=ON -S . -B build3
|
|
|
|
+ run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DDOWNLOAD_CATCH=O -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" -S . -B build3
|
2021-08-26 22:03:41 +00:00
|
|
|
|
|
|
|
- name: Build C++17
|
|
|
|
run: cmake --build build3 -j 2
|