From 6422b6098624b468baf84aab1c7ca81443109135 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 13 Apr 2021 16:51:27 +0200
Subject: [PATCH] gh-actions: adapt to currently available compiler versions

---
 .github/workflows/cmake-build-ci.gen | 15 ++++------
 .github/workflows/cmake-build-ci.yml | 41 ++++++++--------------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 278fe076..e3031cb4 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -40,14 +40,13 @@ const MAP = [
           'env.CC_VER' => [
             "new"  => "-10",
             "cur"  => "-9",
-            "old"  => "-8"
           ]
         ],
         "clang" => [
           'env.CC_VER' => [
-            "new"  => "-10",
-            "cur"  => "-9",
-            "old"  => "-8"
+            "new"  => "-11",
+            "cur"  => "-10",
+            "old"  => "-9"
           ]
         ]
       ]
@@ -56,16 +55,14 @@ const MAP = [
       'env.CC_VND' => [
         "gnu" => [
           'env.CC_VER' => [
-            "new"  => "-9",
-            "cur"  => "-8",
+            "new"  => "-10",
+            "cur"  => "-9",
             "old"  => "-7"
           ]
         ],
         "clang" => [
           'env.CC_VER' => [
-            "new"  => "-9",
-            "cur"  => "-8",
-            "old"  => "-6.0"
+            "cur"  => "-9",
           ]
         ]
       ]
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index a86e95ae..61566d93 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -449,63 +449,46 @@ jobs:
         run: |
           echo CC="gcc-9" >> ${GITHUB_ENV}
           echo CXX="g++-9" >> ${GITHUB_ENV}
-      - name: Prepare environment (for old gnu on ubuntu-20.04)
-        if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
-        run: |
-          echo CC="gcc-8" >> ${GITHUB_ENV}
-          echo CXX="g++-8" >> ${GITHUB_ENV}
       - name: Prepare environment (for new clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
         run: |
-          echo CC="clang-10" >> ${GITHUB_ENV}
-          echo CXX="clang++-10" >> ${GITHUB_ENV}
+          echo CC="clang-11" >> ${GITHUB_ENV}
+          echo CXX="clang++-11" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
-          echo CC="clang-9" >> ${GITHUB_ENV}
-          echo CXX="clang++-9" >> ${GITHUB_ENV}
+          echo CC="clang-10" >> ${GITHUB_ENV}
+          echo CXX="clang++-10" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
           echo INSTALL_CXX="libc++-9-dev libc++abi-9-dev" >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
         run: |
-          echo CC="clang-8" >> ${GITHUB_ENV}
-          echo CXX="clang++-8" >> ${GITHUB_ENV}
+          echo CC="clang-9" >> ${GITHUB_ENV}
+          echo CXX="clang++-9" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
           echo INSTALL_CXX="libc++-8-dev libc++abi-8-dev" >> ${GITHUB_ENV}
       - name: Prepare environment (for new gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
         run: |
-          echo CC="gcc-9" >> ${GITHUB_ENV}
-          echo CXX="g++-9" >> ${GITHUB_ENV}
+          echo CC="gcc-10" >> ${GITHUB_ENV}
+          echo CXX="g++-10" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo CC="gcc-8" >> ${GITHUB_ENV}
-          echo CXX="g++-8" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Prepare environment (for old gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
         run: |
           echo CC="gcc-7" >> ${GITHUB_ENV}
           echo CXX="g++-7" >> ${GITHUB_ENV}
-      - name: Prepare environment (for new clang on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
-        run: |
-          echo CC="clang-9" >> ${GITHUB_ENV}
-          echo CXX="clang++-9" >> ${GITHUB_ENV}
-          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
-          echo CC="clang-8" >> ${GITHUB_ENV}
-          echo CXX="clang++-8" >> ${GITHUB_ENV}
-          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
-      - name: Prepare environment (for old clang on ubuntu-18.04)
-        if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
-        run: |
-          echo CC="clang-6.0" >> ${GITHUB_ENV}
-          echo CXX="clang++-6.0" >> ${GITHUB_ENV}
+          echo CC="clang-9" >> ${GITHUB_ENV}
+          echo CXX="clang++-9" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
-- 
2.30.2