From 55049983c435a40da656ce76afeab28b7617f040 Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Wed, 7 Apr 2021 13:23:48 +0200
Subject: [PATCH] Add more compiler variants to GitHub Actions

This changes the workflow definition so that we always try to install
compiler toolchains that we need.

See https://github.com/actions/virtual-environments/issues/2950 for more
context.

Drive-by:
- Mini fix to enable compilation under Clang 6.0

Signed-off-by: Christian Blichmann <cblichmann@google.com>
---
 .github/workflows/ubuntu-cmake.yml | 45 ++++++++++++++++++++++++++++--
 sandboxed_api/sandbox2/syscall.cc  |  1 -
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
index ce4ad85..1ade9d7 100644
--- a/.github/workflows/ubuntu-cmake.yml
+++ b/.github/workflows/ubuntu-cmake.yml
@@ -7,10 +7,37 @@ env:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
+        include:
+          - os: ubuntu-20.04
+            compiler: clang
+            compiler-version: 11
+            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
+            compiler: gcc
+            compiler-version: 10
+            ignore-errors: false
+          - os: ubuntu-20.04
+            compiler: gcc
+            compiler-version: 9
+            ignore-errors: false
+          - os: ubuntu-18.04
+            compiler: gcc
+            compiler-version: 7
+            ignore-errors: false
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.ignore-errors }}
 
     steps:
     - uses: actions/checkout@v2
@@ -18,6 +45,20 @@ jobs:
     - name: Install ninja-build tool
       uses: seanmiddleditch/gha-setup-ninja@v3
 
+    - name: Install/configure Clang compiler toolchain
+      if: matrix.compiler == 'clang'
+      run: |
+        sudo apt-get install -qy clang-${{matrix.compiler-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}}
+        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
diff --git a/sandboxed_api/sandbox2/syscall.cc b/sandboxed_api/sandbox2/syscall.cc
index 6c73e74..85c1aa6 100644
--- a/sandboxed_api/sandbox2/syscall.cc
+++ b/sandboxed_api/sandbox2/syscall.cc
@@ -47,7 +47,6 @@ std::string Syscall::GetArchDescription(sapi::cpu::Architecture arch) {
     case sapi::cpu::kArm:
       return "[Arm-32]";
     default:
-      LOG(ERROR) << "Unknown CPU architecture: " << arch;
       return absl::StrFormat("[UNKNOWN_ARCH:%d]", arch);
   }
 }