From 1ee0f297a63728b45814017d0b8a278b3b8eeb09 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Thu, 3 Feb 2022 15:09:22 -0800
Subject: [PATCH] Tracking ci.yml changes from master.

---
 .github/workflows/ci_sh_def.yml       | 19 ++++---------------
 .github/workflows/ci_sh_def.yml.patch | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci_sh_def.yml b/.github/workflows/ci_sh_def.yml
index 05cacc928..2b424f424 100644
--- a/.github/workflows/ci_sh_def.yml
+++ b/.github/workflows/ci_sh_def.yml
@@ -622,11 +622,11 @@ jobs:
       fail-fast: false
       matrix:
         centos:
-          - 7  # GCC 4.8
-          - 8
+          - centos7  # GCC 4.8
+          - stream8
 
     name: "🐍 3 • CentOS ${{ matrix.centos }} • x64"
-    container: "centos:${{ matrix.centos }}"
+    container: "quay.io/centos/centos:${{ matrix.centos }}"
 
     steps:
     - uses: actions/checkout@v2
@@ -641,22 +641,11 @@ jobs:
       run: |
         python3 -m pip install cmake -r tests/requirements.txt
 
-    - name: VAR_BUILD_TYPE 7
-      if: matrix.centos == 7
-      run: echo MinSizeRel > VAR_BUILD_TYPE
-
-    # Using Release to avoid segfault that appeared around 2021-06-04,
-    # apparently when the gcc version changed from 8.3 to 8.4.
-    - name: VAR_BUILD_TYPE 8
-      if: matrix.centos == 8
-      run: echo Release > VAR_BUILD_TYPE
-
-    # Temporally disabling EIGEN due to SSL issue in CentOS 7
     - name: Configure
       shell: bash
       run: >
         cmake -S . -B build
-        -DCMAKE_BUILD_TYPE=$(cat VAR_BUILD_TYPE)
+        -DCMAKE_BUILD_TYPE=MinSizeRel
         -DPYBIND11_WERROR=ON
         -DDOWNLOAD_CATCH=ON
         -DDOWNLOAD_EIGEN=ON
diff --git a/.github/workflows/ci_sh_def.yml.patch b/.github/workflows/ci_sh_def.yml.patch
index 7d71f87ac..0ca9ed10f 100644
--- a/.github/workflows/ci_sh_def.yml.patch
+++ b/.github/workflows/ci_sh_def.yml.patch
@@ -1,5 +1,5 @@
---- ci.yml	2022-01-26 09:58:21.687199720 -0800
-+++ ci_sh_def.yml	2022-01-26 09:58:52.261291935 -0800
+--- ci.yml	2022-02-03 15:07:04.351781701 -0800
++++ ci_sh_def.yml	2022-02-03 15:08:50.314616526 -0800
 @@ -1,4 +1,16 @@
 -name: CI
 +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -110,7 +110,7 @@
          -DCMAKE_CXX_COMPILER=$(which icpc)  \
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
-@@ -640,6 +661,7 @@
+@@ -629,6 +650,7 @@
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
          -DCMAKE_CXX_STANDARD=11
@@ -118,7 +118,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
  
      - name: Build
-@@ -690,6 +712,7 @@
+@@ -679,6 +701,7 @@
          cmake ../pybind11-tests
          -DDOWNLOAD_CATCH=ON
          -DPYBIND11_WERROR=ON
@@ -126,7 +126,7 @@
          -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
        working-directory: /build-tests
  
-@@ -782,6 +805,7 @@
+@@ -771,6 +794,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
@@ -134,7 +134,7 @@
          ${{ matrix.args }}
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -829,6 +853,7 @@
+@@ -818,6 +842,7 @@
          -DPYBIND11_WERROR=ON
          -DDOWNLOAD_CATCH=ON
          -DDOWNLOAD_EIGEN=ON
@@ -142,7 +142,7 @@
  
      - name: Build C++14
        run: cmake --build build -j 2
-@@ -854,11 +879,11 @@
+@@ -843,11 +868,11 @@
            - python: 2.7
              std: 17
              args: >
@@ -156,7 +156,7 @@
  
      steps:
      - uses: actions/checkout@v2
-@@ -926,7 +951,7 @@
+@@ -915,7 +940,7 @@
      - name: Configure C++11
        # LTO leads to many undefined reference like
        # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@@ -165,7 +165,7 @@
  
      - name: Build C++11
        run: cmake --build build -j 2
-@@ -944,7 +969,7 @@
+@@ -933,7 +958,7 @@
        run: git clean -fdx
  
      - name: Configure C++14
@@ -174,7 +174,7 @@
  
      - name: Build C++14
        run: cmake --build build2 -j 2
-@@ -962,7 +987,7 @@
+@@ -951,7 +976,7 @@
        run: git clean -fdx
  
      - name: Configure C++17