From 734d39fbf7014e36e4df094dc094bae4a8480088 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 13 Apr 2021 17:10:38 +0200
Subject: [PATCH] gh-actions: fix libc++ versions

---
 .github/workflows/cmake-build-ci.gen | 13 ++++---------
 .github/workflows/cmake-build-ci.yml |  7 +++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index e3031cb4..9cc3bd97 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -71,23 +71,18 @@ const MAP = [
 ];
 const ENV = [
   "ubuntu-20.04" => [
-    "gnu" => [
-      "new" => [
-        "INSTALL_CC" => "gcc-10",
-        "INSTALL_CXX" => "g++-10",
-      ]
-    ],
     "clang" => [
       "new" => [
-        "CXXFLAGS" => "-stdlib=libc++"
+        "CXXFLAGS" => "-stdlib=libc++",
+        "INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
       ],
       "cur" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
+        "INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
       ],
       "old" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-8-dev libc++abi-8-dev"
+        "INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
       ],
     ]
   ],
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 61566d93..4c5892d3 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -442,8 +442,6 @@ jobs:
         run: |
           echo CC="gcc-10" >> ${GITHUB_ENV}
           echo CXX="g++-10" >> ${GITHUB_ENV}
-          echo INSTALL_CC="gcc-10" >> ${GITHUB_ENV}
-          echo INSTALL_CXX="g++-10" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
@@ -455,20 +453,21 @@ jobs:
           echo CC="clang-11" >> ${GITHUB_ENV}
           echo CXX="clang++-11" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
+          echo INSTALL_CXX="libc++-11-dev libc++abi-11-dev" >> ${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-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}
+          echo INSTALL_CXX="libc++-10-dev libc++abi-10-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-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}
+          echo INSTALL_CXX="libc++-9-dev libc++abi-9-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: |
-- 
2.30.2