From d3f9a3ef2ebfc927ba4f8e48308c3f0739e84ee0 Mon Sep 17 00:00:00 2001
From: Igor Krivenko <igor.s.krivenko@gmail.com>
Date: Tue, 16 Jul 2024 14:09:58 +0200
Subject: [PATCH] CI: Switch to macOS-12 / GCC 11 after removal of macOS-11

---
 .github/workflows/build-test-deploy.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index faa627b..090fb53 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -13,10 +13,10 @@ jobs:
   build-test-deploy:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11]
-        cxx_compiler:
-        - { name: "gcc", cxx: "g++-10" }
-        - { name: "clang", cxx: "clang++" }
+        - {os: "ubuntu-20.04", cc: "gcc", cxx: "g++-10" }
+        - {os: "ubuntu-20.04", cc: "clang", cxx: "clang++" }
+        - {os: "macos-12", cc: "gcc", cxx: "g++-11" }
+        - {os: "macos-12", cc: "clang", cxx: "clang++" }
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -33,7 +33,7 @@ jobs:
            fi
 
     - name: Set up Python 3.8
-      if: startsWith(matrix.cxx_compiler.name, 'clang')
+      if: startsWith(matrix.cxx, 'clang')
       uses: actions/setup-python@v4
       with:
         python-version: 3.8
@@ -43,7 +43,7 @@ jobs:
       run: sudo apt-get install cppcheck
 
     - name: Install Sphinx and Read the Docs Sphinx Theme
-      if: startsWith(matrix.cxx_compiler.name, 'clang')
+      if: startsWith(matrix.cxx, 'clang')
       run: |
            python -m pip install --upgrade pip
            pip install sphinx sphinx-rtd-theme myst-parser
@@ -58,12 +58,12 @@ jobs:
              STATIC_ANALYSIS=OFF
            fi
 
-           if [[ "${{ matrix.cxx_compiler.name }}" == clang* ]]; then
+           if [[ "${{ matrix.cxx }}" == clang* ]]; then
              DOCS=ON
            else
              DOCS=OFF
            fi
-           CXX="${{ matrix.cxx_compiler.cxx }}" cmake ..                       \
+           CXX="${{ matrix.cxx }}" cmake ..                       \
              -DCMAKE_BUILD_TYPE=Debug                                          \
              -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/installed              \
              -DCMAKE_CXX_FLAGS="-march=native"                                 \
@@ -86,7 +86,7 @@ jobs:
       if: |
           github.ref == 'refs/heads/master' &&
           startsWith(matrix.os, 'ubuntu') &&
-          startsWith(matrix.cxx_compiler.name, 'clang')
+          startsWith(matrix.cxx, 'clang')
       uses: JamesIves/github-pages-deploy-action@v4
       with:
         branch: gh-pages