Some cleanup and work on trying to fix ci

jeremy-rifkin · Feb 13, 2024 · c193dcc · c193dcc
1 parent 3f5e3a7
commit c193dcc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,16 +24,21 @@ jobs:
            cd build
            cmake .. \
             -DCMAKE_BUILD_TYPE=${{matrix.target}} \
-            -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
-            -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h
+            -DCMAKE_CXX_COMPILER=${{matrix.compiler}}
            make -j
   build-macos:
     runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        compiler: [g++-13, clang++]
+        compiler: [g++-12, clang++]
+        c_compiler: [gcc-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
@@ -28,7 +28,6 @@ jobs:
            cmake .. \
             -DCMAKE_BUILD_TYPE=${{matrix.target}} \
             -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
-            -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h \
             -DASSERT_BUILD_TESTING=On
            make -j
     - name: test
@@ -57,7 +56,6 @@ jobs:
            cmake .. \
             -DCMAKE_BUILD_TYPE=${{matrix.target}} \
             -DCMAKE_CXX_COMPILER=${{matrix.compiler}} \
-            -DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/include/backtrace.h \
             -DASSERT_BUILD_TESTING=On
            make -j
     - name: test