Skip to content

Commit

Permalink
ci: Make CMake matrix options work
Browse files Browse the repository at this point in the history
CMAKE_OPTIONS had no effect, leading to the shared library not being
tested. Invoke cmake directly, so we don't have to deal with the mess
in Makefile.
  • Loading branch information
nwellnhof authored and jgm committed Mar 17, 2024
1 parent dfad5a9 commit 55be74f
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ jobs:
sudo apt install -y valgrind
- name: Build and test
run: |
make debug
make test
cmake $CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Debug -S . -B build
cmake --build build
ctest --test-dir build --output-on-failure
make leakcheck
macos:
Expand All @@ -80,11 +81,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Build and test
env:
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=NO
run: |
make debug
make test
cmake $CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=Debug -S . -B build
cmake --build build
ctest --test-dir build --output-on-failure
windows:

Expand All @@ -103,6 +103,7 @@ jobs:
- uses: ilammy/msvc-dev-cmd@v1
- name: Build and test
run: |
chcp 65001
nmake.exe /nologo /f Makefile.nmake test
cmake %CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=Debug -S . -B build
cmake --build build
ctest --test-dir build -C Debug --output-on-failure
shell: cmd

0 comments on commit 55be74f

Please sign in to comment.