Skip to content

Commit 3bcd24d

Browse files
committed
CI: use contemporary CMake commands, remove deprecated parameters
1 parent edd0efb commit 3bcd24d

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/CI.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@ jobs:
6666
-S . -B build
6767
6868
- name: Build and compile
69-
run: cmake --build build
69+
run: cmake --build build --parallel
7070

7171
- name: catch build fail
7272
run: cmake --build build --verbose --parallel 1
7373
if: failure()
7474

7575
- name: test
76-
run: ctest --parallel --output-on-failure
77-
working-directory: build
76+
run: ctest --test-dir build --parallel --output-on-failure
7877

7978
- name: Install project
8079
run: cmake --install build

.github/workflows/ci_windows.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on: [push, pull_request]
44

55
env:
66
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
7+
CMAKE_GENERATOR: Ninja
78

89
jobs:
910
msys2-build:
@@ -57,8 +58,7 @@ jobs:
5758
run: pip install fypp
5859

5960
- run: >-
60-
cmake -G Ninja
61-
-DCMAKE_SH="CMAKE_SH-NOTFOUND"
61+
cmake
6262
-Wdev
6363
-B build
6464
-DCMAKE_BUILD_TYPE=Debug
@@ -78,8 +78,7 @@ jobs:
7878
if: failure()
7979

8080
- name: CTest
81-
run: ctest --output-on-failure --parallel -V -LE quadruple_precision
82-
working-directory: build
81+
run: ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
8382

8483
- uses: actions/upload-artifact@v1
8584
if: failure()

0 commit comments

Comments
 (0)