Skip to content

Commit 9856a79

Browse files
authored
Merge pull request #468 from scivision/update_ci
Update CI
2 parents 233d871 + 3bcd24d commit 9856a79

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/CI.yml

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

55
env:
6-
CI: "ON" # We can detect this in the build system and other vendors implement it
76
CMAKE_BUILD_PARALLEL_LEVEL: "2" # 2 cores on each GHA VM, enable parallel builds
87
CTEST_OUTPUT_ON_FAILURE: "ON" # This way we don't need a flag to ctest
98
CTEST_PARALLEL_LEVEL: "2"
@@ -28,7 +27,7 @@ jobs:
2827

2928
steps:
3029
- name: Checkout code
31-
uses: actions/checkout@v1
30+
uses: actions/checkout@v2
3231

3332
- name: Set up Python 3.x
3433
uses: actions/setup-python@v1 # Use pip to install latest CMake, & FORD/Jin2For, etc.
@@ -67,15 +66,14 @@ jobs:
6766
-S . -B build
6867
6968
- name: Build and compile
70-
run: cmake --build build
69+
run: cmake --build build --parallel
7170

7271
- name: catch build fail
7372
run: cmake --build build --verbose --parallel 1
7473
if: failure()
7574

7675
- name: test
77-
run: ctest --parallel --output-on-failure
78-
working-directory: build
76+
run: ctest --test-dir build --parallel --output-on-failure
7977

8078
- name: Install project
8179
run: cmake --install build
@@ -110,7 +108,7 @@ jobs:
110108

111109
steps:
112110
- name: Checkout code
113-
uses: actions/checkout@v1
111+
uses: actions/checkout@v2
114112

115113
- name: Set up Python 3.x
116114
uses: actions/setup-python@v1

.github/workflows/PR-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Check out code.
9-
uses: actions/checkout@v1
9+
uses: actions/checkout@v2
1010
- name: misspell
1111
uses: reviewdog/action-misspell@v1
1212
with:

.github/workflows/ci_windows.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: CI_windows
33
on: [push, pull_request]
44

55
env:
6-
CI: "ON"
76
CTEST_TIME_TIMEOUT: "5" # some failures hang forever
7+
CMAKE_GENERATOR: Ninja
88

99
jobs:
1010
msys2-build:
@@ -58,8 +58,7 @@ jobs:
5858
run: pip install fypp
5959

6060
- run: >-
61-
cmake -G Ninja
62-
-DCMAKE_SH="CMAKE_SH-NOTFOUND"
61+
cmake
6362
-Wdev
6463
-B build
6564
-DCMAKE_BUILD_TYPE=Debug
@@ -79,8 +78,7 @@ jobs:
7978
if: failure()
8079

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

8583
- uses: actions/upload-artifact@v1
8684
if: failure()

0 commit comments

Comments
 (0)