From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 21 Apr 2021 22:37:55 +0000 (+0100)
Subject: CI: Expand matrix for more toolchain combinations
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e24fbec38e66e0df8471efb0c804256bdac96636;p=xtf.git

CI: Expand matrix for more toolchain combinations

In particular, this now checks LLVM= options for full LLVM toolchains.
Organised to allow arm32/64 support to slot in easily in due couse.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d101d5..bd2cc14 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,25 @@ jobs:
 
     strategy:
       matrix:
-        compiler: [gcc-7, gcc-8, gcc-9, gcc-10, clang-9, clang-10, clang-11]
+        arch: [x86]
+        compiler: [llvm-9, llvm-10, llvm-11]
+
+        include:
+          - arch: x86
+            compiler: gcc-7
+          - arch: x86
+            compiler: gcc-8
+          - arch: x86
+            compiler: gcc-9
+          - arch: x86
+            compiler: gcc-10
+
+          - arch: x86
+            compiler: clang-9
+          - arch: x86
+            compiler: clang-10
+          - arch: x86
+            compiler: clang-11
 
     runs-on: ubuntu-latest
 
@@ -21,4 +39,11 @@ jobs:
 
     - name: Build
       run: |
-        make -j`nproc` CC=${{matrix.compiler}}
+        # Select appropriate LLVM= or CC=
+        c=${{matrix.compiler}}
+        case $c in
+            llvm-*)  COMP="LLVM=${c#llvm}" ;;
+            *)       COMP="CC=$c" ;;
+        esac
+
+        make -j`nproc` ARCH=${{matrix.arch}} $CROSS $COMP