Configure only one job per OS kind to build and run tests with -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT

Remove ci_sh_def.yml

Piggy-backed: Add `smart_holder` to `branches` in emscripten.yaml

.github/workflows/ci.yml

@@ -68,7 +68,18 @@ jobs:
           # Extra ubuntu latest job
           - runs-on: ubuntu-latest
             python: '3.11'
-
+          - runs-on: ubuntu-latest
+            python: '3.12'
+            args: >
+              -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT
+          - runs-on: macos-13
+            python: '3.12'
+            args: >
+              -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT
+          - runs-on: windows-2022
+            python: '3.12'
+            args: >
+              -DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT
 
     name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
     runs-on: ${{ matrix.runs-on }}

.github/workflows/ci_sh_def.yml.patch

@@ -1,223 +0,0 @@
---- ci.yml	2024-07-30 11:20:28.997003056 -0700
-+++ ci_sh_def.yml	2024-07-30 11:21:39.724969167 -0700
-@@ -1,4 +1,16 @@
--name: CI
-+# 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:
-@@ -13,7 +25,7 @@
- permissions: read-all
- 
- concurrency:
--  group: test-sh-avl${{ github.ref }}
-+  group: test-sh-def-${{ github.ref }}
-   cancel-in-progress: true
- 
- env:
-@@ -126,6 +138,7 @@
-         -DDOWNLOAD_CATCH=ON
-         -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
-@@ -155,6 +168,7 @@
-         -DDOWNLOAD_CATCH=ON
-         -DDOWNLOAD_EIGEN=ON
-         -DCMAKE_CXX_STANDARD=17
-+        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT ${{runner.os == 'Windows' && '/GR /EHsc' || ''}}"
-         ${{ matrix.args }}
- 
-     - name: Build
-@@ -174,6 +188,7 @@
-         -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
-         ${{ matrix.args }}
- 
-@@ -217,6 +232,7 @@
-           -DDOWNLOAD_CATCH=ON
-           -DDOWNLOAD_EIGEN=ON
-           -DPython_ROOT_DIR=.venv
-+          -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
- 
-       - name: Build C++11
-         run: cmake --build build -j2
-@@ -290,6 +306,7 @@
-         -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
-@@ -357,6 +374,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
-@@ -386,7 +404,7 @@
-       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
-@@ -474,7 +492,7 @@
-         cmake -S . -B build -DDOWNLOAD_CATCH=ON \
-                             -DCMAKE_CXX_STANDARD=17 \
-                             -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"
- 
-     - name: Build
-@@ -526,6 +544,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
-@@ -548,6 +567,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)")
-         "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- 
-@@ -597,6 +617,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)")
- 
-@@ -629,6 +650,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)")
- 
-@@ -700,6 +722,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
-@@ -750,6 +773,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
- 
-@@ -850,6 +874,7 @@
-         -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 -j 2
-@@ -904,6 +929,7 @@
-         -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
-@@ -946,6 +972,7 @@
-         -DDOWNLOAD_CATCH=ON
-         -DDOWNLOAD_EIGEN=ON
-         -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
-@@ -966,6 +993,7 @@
-         -DDOWNLOAD_CATCH=ON
-         -DDOWNLOAD_EIGEN=ON
-         -DCMAKE_CXX_STANDARD=20
-+        -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-         "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- 
-     - name: Build C++20 - Exercise cmake -DPYBIND11_TEST_OVERRIDE
-@@ -1018,6 +1046,7 @@
-       run: >-
-         cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-         -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
-+        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-         -S . -B build
- 
-     - name: Build C++11
-@@ -1039,6 +1068,7 @@
-       run: >-
-         cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-         -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
-+        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-         -S . -B build2
- 
-     - name: Build C++14
-@@ -1060,6 +1090,7 @@
-       run: >-
-         cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
-         -DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
-+        -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-         -S . -B build3
- 
-     - name: Build C++17
-@@ -1127,6 +1158,7 @@
-           -DDOWNLOAD_EIGEN=ON
-           -DCMAKE_CXX_COMPILER=clang++
-           -DCMAKE_CXX_STANDARD=17
-+          -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
- 
-       - name: Build
-         run: cmake --build . -j 2
-@@ -1192,6 +1224,7 @@
-           -DDOWNLOAD_EIGEN=ON
-           -DCMAKE_CXX_COMPILER=clang++
-           -DCMAKE_CXX_STANDARD=17
-+          -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-           -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- 
-       - name: Build
-@@ -1215,6 +1248,7 @@
-           -DDOWNLOAD_EIGEN=ON
-           -DCMAKE_CXX_COMPILER=clang++
-           -DCMAKE_CXX_STANDARD=17
-+          -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-           -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-           "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- 

.github/workflows/emscripten.yaml

@@ -6,6 +6,7 @@ on:
     branches:
     - master
     - stable
+    - smart_holder
     - v*
 
 concurrency: