Tracking ci.yml changes from master.

.github/workflows/ci_sh_def.yml

@@ -840,55 +840,6 @@ jobs:
     - name: Python tests
       run: cmake --build build --config Debug -t pytest
 
-  win32-msvc2017:
-    name: "🐍 ${{ matrix.python }} • MSVC 2017 • x64"
-    runs-on: windows-2016
-    strategy:
-      fail-fast: false
-      matrix:
-        python:
-          - 3.6
-          - 3.7
-        std:
-          - 14
-
-        include:
-          - python: 3.7
-            std: 17
-            args: >
-              -DCMAKE_CXX_FLAGS="/permissive- /EHsc /GR /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup 🐍 ${{ matrix.python }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python }}
-
-    - name: Update CMake
-      uses: jwlawson/actions-setup-cmake@v1.12
-
-    - name: Prepare env
-      run: |
-        python -m pip install -r tests/requirements.txt
-
-    # First build - C++11 mode and inplace
-    - name: Configure
-      run: >
-        cmake -S . -B build
-        -G "Visual Studio 15 2017" -A x64
-        -DPYBIND11_WERROR=ON
-        -DDOWNLOAD_CATCH=ON
-        -DDOWNLOAD_EIGEN=ON
-        -DCMAKE_CXX_STANDARD=${{ matrix.std }}
-        ${{ matrix.args }}
-
-    - name: Build ${{ matrix.std }}
-      run: cmake --build build -j 2
-
-    - name: Run all checks
-      run: cmake --build build -t check
 
   windows-2022:
     strategy:

.github/workflows/ci_sh_def.yml.patch

@@ -1,5 +1,5 @@
---- ci.yml	2022-03-30 19:33:07.665309863 -0700
-+++ ci_sh_def.yml	2022-03-30 19:34:20.255283874 -0700
+--- ci.yml	2022-04-12 15:49:00.096485388 -0700
++++ ci_sh_def.yml	2022-04-12 15:49:41.587900942 -0700
 @@ -1,4 +1,16 @@
 -name: CI
 +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -142,16 +142,7 @@
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build --config Debug -j 2
-@@ -831,7 +856,7 @@
-           - 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
-@@ -897,6 +922,7 @@
+@@ -848,6 +873,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=20
@@ -159,7 +150,7 @@
  
      - name: Build C++20
        run: cmake --build build -j 2
-@@ -944,7 +970,7 @@
+@@ -895,7 +921,7 @@
      - name: Configure C++11
        # LTO leads to many undefined reference like
        # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -168,7 +159,7 @@
  
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -962,7 +988,7 @@
+@@ -913,7 +939,7 @@
        run: git clean -fdx
  
      - name: Configure C++14
@@ -177,7 +168,7 @@
  
      - name: Build C++14
        run: cmake --build build2 -j 2
-@@ -980,7 +1006,7 @@
+@@ -931,7 +957,7 @@
        run: git clean -fdx
  
      - name: Configure C++17