Skip to content

Commit 6670ba4

Browse files
committed
ci: use presets
1 parent fbed8bc commit 6670ba4

File tree

3 files changed

+48
-10
lines changed

3 files changed

+48
-10
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ jobs:
6161
- uses: actions/checkout@v3
6262

6363
- name: Configure h5fortran
64-
run: cmake -B build -G "Ninja Multi-Config" -DCMAKE_INSTALL_PREFIX=${{ runner.temp }} -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
64+
run: cmake --preset multi -DCMAKE_INSTALL_PREFIX=${{ runner.temp }} -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shared }}
6565

6666
- name: Build Debug
67-
run: cmake --build build --parallel --config Debug
67+
run: cmake --build --parallel --preset debug
6868
- name: Test Debug
69-
run: ctest --test-dir build -C Debug --output-junit test-debug.xml
69+
run: ctest --preset debug --output-junit test-debug.xml
7070

7171
- name: Build Release
72-
run: cmake --build build --parallel --config Release
72+
run: cmake --build --parallel --preset release
7373
- name: Test Release
74-
run: ctest --test-dir build -C Release --output-junit test-release.xml
74+
run: ctest --preset release --output-junit test-release.xml
7575

7676
- name: Publish Unit Test Results
7777
uses: actions/upload-artifact@v3

.github/workflows/intel-oneapi.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ jobs:
6262
run: cmake --build scripts/build --parallel
6363

6464
- name: Configure h5fortran
65-
run: cmake -Bbuild -G "Ninja Multi-Config" -DCMAKE_INSTALL_PREFIX=${{ runner.temp }} -DCMAKE_PREFIX_PATH=${{ runner.temp }}
65+
run: cmake --preset multi -DCMAKE_INSTALL_PREFIX=${{ runner.temp }} -DCMAKE_PREFIX_PATH=${{ runner.temp }}
6666

6767
- name: print config log
6868
if: ${{ failure() }}
6969
run: cat build/CMakeFiles/CMakeError.log
7070

7171
- name: Release build
72-
run: cmake --build build --config Release --parallel
72+
run: cmake --build --preset release --parallel
7373

7474
- name: Release unit test
75-
run: ctest --test-dir build -C Release --output-junit test-release-oneapi.xml
75+
run: ctest --preset release --output-junit test-release-oneapi.xml
7676

7777
- name: debug build
78-
run: cmake --build build --config Debug --parallel
78+
run: cmake --build --preset debug --parallel
7979

8080
- name: debug unit test
81-
run: ctest --test-dir build -C Debug --output-junit test-debug-oneapi.xml
81+
run: ctest --preset debug --output-junit test-debug-oneapi.xml
8282

8383
- name: install package
8484
run: cmake --install build

CMakePresets.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"version": 3,
33

44
"configurePresets": [
5+
{
6+
"name": "multi",
7+
"binaryDir": "${sourceDir}/build",
8+
"displayName": "Ninja Multi-Config",
9+
"generator": "Ninja Multi-Config"
10+
},
511
{
612
"name": "coverage",
713
"binaryDir": "${sourceDir}/build-coverage",
@@ -17,6 +23,22 @@
1723
}
1824
],
1925
"buildPresets": [
26+
{
27+
"name": "release",
28+
"configurePreset": "multi",
29+
"configuration": "Release"
30+
},
31+
{
32+
"name": "reldebug",
33+
"configurePreset": "multi",
34+
"configuration": "RelWithDebInfo",
35+
"displayName": "Release with Debug Info"
36+
},
37+
{
38+
"name": "debug",
39+
"configurePreset": "multi",
40+
"configuration": "Debug"
41+
},
2042
{
2143
"name": "coverage",
2244
"configurePreset": "coverage"
@@ -41,6 +63,22 @@
4163
"stopOnFailure": false,
4264
"timeout": 10
4365
}
66+
},
67+
{
68+
"name": "release", "inherits": "default",
69+
"configurePreset": "multi",
70+
"configuration": "Release"
71+
},
72+
{
73+
"name": "reldebug", "inherits": "default",
74+
"configurePreset": "multi",
75+
"configuration": "RelWithDebInfo",
76+
"displayName": "Release with Debug Info"
77+
},
78+
{
79+
"name": "debug", "inherits": "default",
80+
"configurePreset": "multi",
81+
"configuration": "Debug"
4482
}
4583
]
4684
}

0 commit comments

Comments
 (0)