fix(ci): Make sure Darwin is compiling with the correct compiler

RichieSams · Oct 30, 2023 · 711f05e · 711f05e
1 parent b6eac95
commit 711f05e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 72 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,6 +8,7 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
         config:
           - name: linux_gcc_9
@@ -36,27 +37,32 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: macOS-13
     strategy:
+      fail-fast: false
       matrix:
         config:
           - name: darwin_gcc_9
-            compiler: gcc
-            compiler_version: 9
+            brew_package: gcc@9
+            cc: /usr/local/opt/gcc@9/bin/gcc-9
+            cxx: /usr/local/opt/gcc@9/bin/g++-9
           - name: darwin_gcc_12
-            compiler: gcc
-            compiler_version: 12
+            brew_package: gcc@12
+            cc: /usr/local/opt/gcc@12/bin/gcc-12
+            cxx: /usr/local/opt/gcc@12/bin/g++-12
           - name: darwin_clang_12
-            compiler: clang
-            compiler_version: 12
+            brew_package: llvm@12
+            cc: /usr/local/opt/llvm@12/bin/clang
+            cxx: /usr/local/opt/llvm@12/bin/clang++
           - name: darwin_clang_15
-            compiler: clang
-            compiler_version: 15
+            brew_package: llvm@15
+            cc: /usr/local/opt/llvm@15/bin/clang
+            cxx: /usr/local/opt/llvm@15/bin/clang++
     env:
-      COMPILER: ${{ matrix.config.compiler }}
-      VERSION: ${{ matrix.config.compiler_version }}
+      CC: ${{ matrix.config.cc }}
+      CXX: ${{ matrix.config.cxx }}
     steps:
       - uses: actions/checkout@v4
       - name: Install
-        run: bash ci_scripts/darwin_install_compiler.sh
+        run: brew install ${{ matrix.config.brew_package }}
       - name: Build Debug
         run: make CMAKE_PRESET=Unix_x64_Debug generate build
       - name: Build Release
@@ -67,6 +73,7 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     strategy:
+      fail-fast: false
       matrix:
         config:
           - name: windows_vs_2019

diff --git a/ci_scripts/darwin_install_compiler.sh b/ci_scripts/darwin_install_compiler.sh