Correct macos fix attempt

jeremy-rifkin · Feb 13, 2024 · 624718c · 624718c
1 parent d60da40
commit 624718c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,13 +32,8 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [g++-12, clang++]
-        c_compiler: [gcc-12, clang]
+        c_compiler: [g++-12, clang++]
         target: [Debug, Release]
-        exclude: # TODO: Ugly hack
-          - compiler: g++-12
-            c_compiler: clang
-          - compiler: clang++
-            c_compiler: gcc-12
     steps:
     - uses: actions/checkout@v2
     - name: build

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,9 +39,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [g++-13, clang++]
+        compiler: [g++-12, clang++]
+        c_compiler: [gcc-12, clang]
         target: [Debug]
-        exclude:
+        exclude: # TODO: Ugly hack
+          - compiler: g++-12
+            c_compiler: clang
+          - compiler: clang++
+            c_compiler: gcc-12
           - compiler: clang++ # Disabled due to #15 TODO TODO TODO
             target: Debug
     steps:
@@ -56,6 +61,7 @@ jobs:
            cmake .. \
             -DCMAKE_BUILD_TYPE=${{matrix.target}} \
             -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
+            -DCMAKE_C_COMPILER=${{matrix.c_compiler}} \
             -DASSERT_BUILD_TESTING=On
            make -j
     - name: test