From 76b03643b0123dc077acaa967a9c383deeb923d8 Mon Sep 17 00:00:00 2001
From: Edu Garcia <28616+Arcnor@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:27:48 +0000
Subject: ci: enable both mcode and llvm builds for macos

---
 .github/workflows/Test.yml | 16 ++++++++++++----
 scripts/ci-run.sh          |  7 ++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 436dd1b68..1fa176474 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -154,8 +154,16 @@ jobs:
 #
 
   osx:
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        include: [
+          { backend: mcode },
+          { backend: brew-llvm }
+        ]
     runs-on: macOS-latest
-    name: '🍎 macOS · mcode'
+    name: '🍎 macOS · ${{ matrix.backend }}'
     steps:
 
     - name: '🧰 Checkout'
@@ -176,15 +184,15 @@ jobs:
       run: |
         PATH=$PWD/gnat/bin:$PATH
         ./scripts/ci-run.sh -c
-        mv ghdl-*.tgz ghdl-osx-mcode.tgz
+        mv ghdl-*.tgz ghdl-osx-${{ matrix.backend }}.tgz
       env:
-        TASK: macosx+mcode
+        TASK: macosx+${{ matrix.backend }}
         GITHUB_OS: ${{ runner.os }}
 
     - name: '📤 Upload artifact: package'
       uses: actions/upload-artifact@v2
       with:
-        path: ghdl-osx-mcode.tgz
+        path: ghdl-osx-${{ matrix.backend }}.tgz
 
 #
 # Windows Build
diff --git a/scripts/ci-run.sh b/scripts/ci-run.sh
index c6d04395c..d6bbbd8cd 100755
--- a/scripts/ci-run.sh
+++ b/scripts/ci-run.sh
@@ -294,6 +294,11 @@ build () {
           CXX="clang++-$llvmver"
           CONFIG_OPTS+=" --with-llvm-config=llvm-config-$llvmver CXX=$CXX"
       ;;
+      brew-llvm)
+          llvmprefix=`brew --prefix llvm`
+          CXX="clang++"
+          CONFIG_OPTS+=" --with-llvm-config=$llvmprefix/bin/llvm-config CXX=$CXX"
+      ;;
       *)
           printf "$ANSI_RED[GHDL - build] Unknown build $BACK $ANSI_NOCOLOR\n"
           exit 1;;
@@ -424,7 +429,7 @@ ci_run () {
 
   if [ "x$IS_MACOS" = "xtrue" ]; then
       CC=clang \
-      prefix="`cd ./install-mcode; pwd`/usr/local" \
+      prefix="`pwd`/install-$BACK/usr/local" \
       ./testsuite/testsuite.sh sanity gna vests vpi
   else
       # Build ghdl/ghdl:$GHDL_IMAGE_TAG image
-- 
cgit v1.2.3