Skip to content

Commit 6b0194d

Browse files
committed
Just use 'make check' to run tests on Github actions for every configuration
but Win+MSVC; the tests previously were not being run at all!
1 parent 4cea9c0 commit 6b0194d

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

.github/workflows/fedora.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
;;
6060
esac
6161
62-
dnf install -y cmake ninja-build git
62+
dnf install -y cmake git
6363
6464
- name: Checkout
6565
uses: actions/checkout@v4
@@ -77,16 +77,12 @@ jobs:
7777
;;
7878
esac
7979
80-
cmake -B build -G Ninja \
81-
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
82-
-DCMAKE_C_COMPILER="${CC}" \
83-
-DCMAKE_CXX_COMPILER="${CXX}" \
84-
-DCXX_STD=${{ matrix.cxx_std }}
80+
mkdir build
81+
cd build
82+
cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DCXX_STD=${{ matrix.cxx_std }}
8583
8684
- name: Build
87-
working-directory: build
88-
run: cmake --build .
85+
run: cd build ; make -j4
8986

9087
- name: Test
91-
working-directory: build/test
92-
run: ctest -C ${{ env.BUILD_TYPE }} -j $(nproc) --output-on-failure
88+
run: cd build ; make check

.github/workflows/macos-12.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232

3333
- name: Test
3434
working-directory: build
35-
run: ctest -C ${{ env.BUILD_TYPE }} -j $(sysctl -n hw.ncpu) --output-on-failure
35+
run: make check

.github/workflows/ubuntu.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,18 @@ jobs:
2626
runs-on: ${{ matrix.os }}
2727

2828
steps:
29-
- name: Install Dependencies
30-
run: |
31-
sudo apt-get update
32-
sudo apt-get install -y ninja-build
33-
3429
- uses: actions/checkout@v4
3530

3631
- name: Configure CMake
3732
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
3833
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
39-
run: cmake -B build -G Ninja \
40-
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
41-
-DCMAKE_CXX_COMPILER=${{ matrix.compiler_version }} \
42-
-DCXX_STD=${{ matrix.cxx_std }}
34+
run: |
35+
mkdir build
36+
cd build
37+
cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler_version }} -DCXX_STD=${{ matrix.cxx_std }}
4338
4439
- name: Build
45-
working-directory: build
46-
run: cmake --build .
40+
run: cd build ; make -j4
4741

4842
- name: Test
49-
working-directory: build
50-
run: ctest -C ${{ env.BUILD_TYPE }} -j $(nproc) --output-on-failure
43+
run: cd build ; make check

0 commit comments

Comments
 (0)