From bcc241fc4de8ae5da79b77cf46b298204645358c Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Thu, 10 Mar 2022 10:37:16 -0800
Subject: [PATCH] Tracking ci.yml changes from master.

---
 .github/workflows/ci_sh_def.yml       | 59 ++++++++++++++++++++++++++-
 .github/workflows/ci_sh_def.yml.patch | 22 ++++++----
 2 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml
index bf690b99f..490327ffb 100644
--- a/.github/workflows/ci_sh_def.yml
+++ b/.github/workflows/ci_sh_def.yml
@@ -43,8 +43,8 @@ jobs:
         - '3.6'
         - '3.9'
         - '3.10'
-        - 'pypy-3.7-v7.3.7'
-        - 'pypy-3.8-v7.3.7'
+        - 'pypy-3.7'
+        - 'pypy-3.8'
 
         # Items in here will either be added to the build matrix (if not
         # present), or add new keys to an existing matrix element if all the
@@ -780,6 +780,61 @@ jobs:
     - name: Python tests
       run: cmake --build build -t pytest
 
+  win32-debug:
+    strategy:
+      fail-fast: false
+      matrix:
+        python:
+        - 3.8
+        - 3.9
+
+        include:
+          - python: 3.9
+            args: -DCMAKE_CXX_STANDARD=20
+          - python: 3.8
+            args: -DCMAKE_CXX_STANDARD=17
+
+    name: "🐍 ${{ matrix.python }} • MSVC 2019 (Debug) • x86 ${{ matrix.args }}"
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Python ${{ matrix.python }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+        architecture: x86
+
+    - name: Update CMake
+      uses: jwlawson/actions-setup-cmake@v1.12
+
+    - name: Prepare MSVC
+      uses: ilammy/msvc-dev-cmd@v1.10.0
+      with:
+        arch: x86
+
+    - name: Prepare env
+      run: |
+        python -m pip install -r tests/requirements.txt
+
+    # First build - C++11 mode and inplace
+    - name: Configure ${{ matrix.args }}
+      run: >
+        cmake -S . -B build
+        -G "Visual Studio 16 2019" -A Win32
+        -DCMAKE_BUILD_TYPE=Debug
+        -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
+
+    - name: Python tests
+      run: cmake --build build --config Debug -t pytest
+
   win32-msvc2017:
     name: "🐍 ${{ matrix.python }} • MSVC 2017 • x64"
     runs-on: windows-2016
diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch
index 1195d94ba..d61c8957f 100644
--- a/.github/workflows/ci_sh_def.yml.patch
+++ b/.github/workflows/ci_sh_def.yml.patch
@@ -1,5 +1,5 @@
---- ci.yml	2022-02-23 15:47:03.642613491 -0800
-+++ ci_sh_def.yml	2022-02-23 15:48:12.551316461 -0800
+--- ci.yml	2022-03-10 10:32:48.282365464 -0800
++++ ci_sh_def.yml	2022-03-10 10:38:55.058650883 -0800
 @@ -1,4 +1,16 @@
 -name: CI
 +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -134,7 +134,15 @@
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -772,7 +796,7 @@
+@@ -803,6 +827,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
+@@ -826,7 +851,7 @@
            - python: 3.7
              std: 17
              args: >
@@ -143,7 +151,7 @@
  
      steps:
      - uses: actions/checkout@v2
-@@ -838,6 +862,7 @@
+@@ -892,6 +917,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=20
@@ -151,7 +159,7 @@
  
      - name: Build C++20
        run: cmake --build build -j 2
-@@ -885,7 +910,7 @@
+@@ -939,7 +965,7 @@
      - name: Configure C++11
        # LTO leads to many undefined reference like
        # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -160,7 +168,7 @@
  
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -903,7 +928,7 @@
+@@ -957,7 +983,7 @@
        run: git clean -fdx
  
      - name: Configure C++14
@@ -169,7 +177,7 @@
  
      - name: Build C++14
        run: cmake --build build2 -j 2
-@@ -921,7 +946,7 @@
+@@ -975,7 +1001,7 @@
        run: git clean -fdx
  
      - name: Configure C++17