From 1854a3a376c562b1d85c246f6c44518bf38a8c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Borz=C3=AC?= <borzifrancesco@gmail.com>
Date: Tue, 18 Aug 2020 16:36:16 +0200
Subject: [PATCH] feat(CI): add Ubuntu 18.04 to the CI (#3311)

---
 .github/workflows/core_build.yml | 17 ++++++++++++-----
 apps/ci/ci-install.sh            |  8 ++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/core_build.yml b/.github/workflows/core_build.yml
index 18571a16e..43110a1d7 100644
--- a/.github/workflows/core_build.yml
+++ b/.github/workflows/core_build.yml
@@ -11,10 +11,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # the result of the matrix will be the combination of all attributes, so we get os*compiler*modules builds
+        os: [ubuntu-20.04]
         compiler: [clang6, clang9, clang10]
         modules: [with, without]
-    runs-on: ubuntu-20.04
-    name: ${{ matrix.compiler }}-${{ matrix.modules }}-modules
+        # we can include specific combinations here
+        include:
+          - os: ubuntu-18.04
+            compiler: clang
+            modules: without
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.modules }}-modules
     env:
       COMPILER: ${{ matrix.compiler }}
     steps:
@@ -26,10 +33,10 @@ jobs:
         uses: actions/cache@v1.1.2
         with:
           path: /home/runner/.ccache
-          key: ccache:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}:${{ github.sha }}
+          key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}:${{ github.sha }}
           restore-keys: |
-            ccache:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
-            ccache:${{ matrix.compiler }}:${{ matrix.modules }}-modules
+            ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
+            ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
       - name: Configure OS
         run: source ./apps/ci/ci-install.sh
         env:
diff --git a/apps/ci/ci-install.sh b/apps/ci/ci-install.sh
index 8ae35ee7d..ed9b19ada 100755
--- a/apps/ci/ci-install.sh
+++ b/apps/ci/ci-install.sh
@@ -25,6 +25,14 @@ time sudo apt-get install -y git lsb-release sudo ccache
 time ./acore.sh install-deps
 
 case $COMPILER in
+
+  # this is in order to use the "default" clang version of the OS, without forcing a specific version
+  "clang" )
+    time sudo apt-get install -y clang
+    echo "CCOMPILERC=\"clang\"" >> ./conf/config.sh
+    echo "CCOMPILERCXX=\"clang++\"" >> ./conf/config.sh
+    ;;
+
   "clang6" )
     time sudo apt-get install -y clang-6.0
     echo "CCOMPILERC=\"clang-6.0\"" >> ./conf/config.sh