From 5f9d593a0edb1d0121b8db2d8e356c3740ea7925 Mon Sep 17 00:00:00 2001 From: Ryan Hartlage Date: Thu, 14 Nov 2024 17:02:06 -0500 Subject: [PATCH 1/2] Fix macOS CI --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd79100..994c68a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - os: [ubuntu-22.04, ubuntu-24.04, ubuntu-latest, macos-13] + os: [ubuntu-22.04, ubuntu-24.04, ubuntu-latest, macos-latest] steps: - name: Install CppUTest @@ -28,4 +28,8 @@ jobs: with: submodules: 'recursive' + - name: Configure brew paths on macOS + if: matrix.os == 'macos-latest' + run: export CPATH="$CPATH:$(brew --prefix)/include" && export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" + - run: make -j${{ steps.cpu-cores.outputs.count }} From 6b135bb1911ba698b5e328c3431b10ec363d8c9d Mon Sep 17 00:00:00 2001 From: Ryan Hartlage Date: Thu, 14 Nov 2024 17:04:53 -0500 Subject: [PATCH 2/2] Try again --- .github/workflows/test.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 994c68a..d0bdbfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,8 +28,10 @@ jobs: with: submodules: 'recursive' - - name: Configure brew paths on macOS + - name: Test on macOS if: matrix.os == 'macos-latest' - run: export CPATH="$CPATH:$(brew --prefix)/include" && export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" + run: CPATH="$CPATH:$(brew --prefix)/include" LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" make -j${{ steps.cpu-cores.outputs.count }} - - run: make -j${{ steps.cpu-cores.outputs.count }} + - name: Test on Linux + if: matrix.os != 'macos-latest' + run: make -j${{ steps.cpu-cores.outputs.count }}