From 340ca4f37ab55767d593aea5d86fb3e75e6a80ba Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Tue, 16 May 2023 04:22:57 -0700
Subject: [PATCH] GitHub Worklows: Update OS/compiler matrix, deprecate GCC 6
 and 7

To fix Python related errors, explicitly install `libclang1-dev` and `clang`
PIP packages that match.

PiperOrigin-RevId: 532411402
Change-Id: I448a5db4e7d802b7929d93844827906f4e4413de
---
 .github/workflows/ubuntu-cmake.yml | 76 ++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
index f2cd3d5..04f4f70 100644
--- a/.github/workflows/ubuntu-cmake.yml
+++ b/.github/workflows/ubuntu-cmake.yml
@@ -11,41 +11,63 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # Ubuntu 22.04: Use preinstalled Clang 12.0.1, 13.0.1 and 14.0.0
           - os: ubuntu-22.04
             compiler: clang
-            compiler-version: 11
-            # Ubuntu 22.04 is in beta
-            ignore-errors: true
+            compiler-version: 14
+            libclang-version: 14
+            pip-clang-version: "14.0"
+            ignore-errors: false
+          - os: ubuntu-22.04
+            compiler: clang
+            compiler-version: 13
+            libclang-version: 13
+            pip-clang-version: "13.0.1"
+            ignore-errors: false
+          - os: ubuntu-22.04
+            compiler: clang
+            compiler-version: 12
+            libclang-version: 12
+            pip-clang-version: "12.0.1"
+            ignore-errors: false
+          # Ubuntu 22.04: Use preinstalled GCC 9.5.0, 10.4.0, 11.3.0, 12.1.0
+          - os: ubuntu-22.04
+            compiler: gcc
+            compiler-version: 12
+            libclang-version: 14
+            pip-clang-version: "14.0"
+            ignore-errors: false
           - os: ubuntu-22.04
             compiler: gcc
             compiler-version: 11
-            # Ubuntu 22.04 is in beta
-            ignore-errors: true
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler-version: 11
+            libclang-version: 14
+            pip-clang-version: "14.0"
             ignore-errors: false
-          - os: ubuntu-20.04
-            compiler: clang
-            compiler-version: 10
-            ignore-errors: false
-          - os: ubuntu-18.04
-            compiler: clang
-            compiler-version: "6.0"
-            # This compiler is supported only on a best-effort basis
-            ignore-errors: true
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: gcc
             compiler-version: 10
+            libclang-version: 14
+            pip-clang-version: "14.0"
             ignore-errors: false
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: gcc
             compiler-version: 9
+            libclang-version: 14
+            pip-clang-version: "14.0"
             ignore-errors: false
-          - os: ubuntu-18.04
+          # Ubuntu 20.04
+          - os: ubuntu-20.04
+            compiler: gcc
+            compiler-version: 8
+            libclang-version: 12
+            pip-clang-version: "12.0.1"
+            ignore-errors: false
+          - os: ubuntu-20.04
             compiler: gcc
             compiler-version: 7
-            ignore-errors: false
+            libclang-version: 12
+            pip-clang-version: "12.0.1"
+            ignore-errors: true  # GCC 7 is best effort
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.ignore-errors }}
 
@@ -65,21 +87,25 @@ jobs:
     - name: Install/configure Clang compiler toolchain
       if: matrix.compiler == 'clang'
       run: |
-        sudo apt-get install -qy clang-${{matrix.compiler-version}}
+        sudo apt-get install -qy \
+          clang-${{matrix.compiler-version}} \
+          libclang1-${{matrix.libclang-version}}
         echo "CXX=clang++-${{matrix.compiler-version}}" >> $GITHUB_ENV
         echo "CC=clang-${{matrix.compiler-version}}" >> $GITHUB_ENV
 
     - name: Install/configure GCC compiler toolchain
       if: matrix.compiler == 'gcc'
       run: |
-        sudo apt-get install -qy g++-${{matrix.compiler-version}}
+        sudo apt-get install -qy \
+          g++-${{matrix.compiler-version}} \
+          libclang1-${{matrix.libclang-version}}
         echo "CXX=g++-${{matrix.compiler-version}}" >> $GITHUB_ENV
         echo "CC=gcc-${{matrix.compiler-version}}" >> $GITHUB_ENV
 
     - name: Create Build Environment
       run: |
-        pip3 install absl-py clang
-        cmake -E make_directory $GITHUB_WORKSPACE/build
+        pip3 install absl-py clang==${{matrix.pip-clang-version}}
+        mkdir -p "$GITHUB_WORKSPACE/build"
 
     - name: Configure CMake
       run: |