From: Michael Wallner <mike@php.net>
Date: Tue, 1 Jun 2021 10:33:28 +0000 (+0200)
Subject: github: update workflow for new clang version
X-Git-Tag: 1.1.0~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=cebf3edfe4a779ae8de9f9cb934dde035661283f;p=awesomized%2Flibmemcached

github: update workflow for new clang version
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 9cc3bd97..e76d433f 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -44,9 +44,9 @@ const MAP = [
         ],
         "clang" => [
           'env.CC_VER' => [
-            "new"  => "-11",
-            "cur"  => "-10",
-            "old"  => "-9"
+            "new"  => "-12",
+            "cur"  => "-11",
+            "old"  => "-10"
           ]
         ]
       ]
@@ -74,15 +74,15 @@ const ENV = [
     "clang" => [
       "new" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
+        "INSTALL_CXX" => "libc++-12-dev libc++abi-12-dev"
       ],
       "cur" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
+        "INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
       ],
       "old" => [
         "CXXFLAGS" => "-stdlib=libc++",
-        "INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev"
+        "INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
       ],
     ]
   ],
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 4c5892d3..0dd0a4de 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -450,24 +450,24 @@ jobs:
       - 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-11" >> ${GITHUB_ENV}
-          echo CXX="clang++-11" >> ${GITHUB_ENV}
+          echo CC="clang-12" >> ${GITHUB_ENV}
+          echo CXX="clang++-12" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
-          echo INSTALL_CXX="libc++-11-dev libc++abi-11-dev" >> ${GITHUB_ENV}
+          echo INSTALL_CXX="libc++-12-dev libc++abi-12-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 CC="clang-11" >> ${GITHUB_ENV}
+          echo CXX="clang++-11" >> ${GITHUB_ENV}
           echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
-          echo INSTALL_CXX="libc++-10-dev libc++abi-10-dev" >> ${GITHUB_ENV}
+          echo INSTALL_CXX="libc++-11-dev libc++abi-11-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 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 new gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
         run: |
diff --git a/README.md b/README.md
index 81a0807e..3b594b37 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ CI/Testing is performed on the following system matrix:
 
 | OS               | Compiler                     | Arch                    | Comments                   |
 |------------------|------------------------------|-------------------------|----------------------------|
-| Linux            | GNU 7/9/10, Clang 9/10/11    | amd64                   | sasl, coverage, sanitizers |
+| Linux            | GNU 7/9/10, Clang 9/10/11/12 | amd64                   | sasl, coverage, sanitizers |
 | MacOS            | AppleClang 12                | amd64                   | sasl, coverage             |
 | FreeBSD          | Clang 11                     | amd64                   | sasl, coverage             |
 | OpenBSD          | Clang 10                     | amd64                   | sasl, coverage             |