Skip to content

Commit ee32801

Browse files
committed
ci: also test with GNU Make
1 parent e98ff9f commit ee32801

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

.github/workflows/composite-unix/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ runs:
1010
- run: cmake --workflow release
1111
shell: bash
1212

13+
- name: GNU Make build and test
14+
run: cmake --workflow gmake --fresh
15+
shell: bash
16+
1317
- name: upload CMakeConfigureLog.yaml
1418
if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''
1519
uses: actions/upload-artifact@v4
1620
with:
17-
name: ${{ runner.os }}-${{ env.CC }}-CMakeConfigureLog.yaml
21+
name: ${{ runner.os }}-${{ env.CC }}-${{ env.FC }}-CMakeConfigureLog.yaml
1822
path: build/CMakeFiles/CMakeConfigureLog.yaml

CMakePresets.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"displayName": "Ninja Multi-Config",
1616
"generator": "Ninja Multi-Config"
1717
},
18+
{
19+
"name": "gmake", "inherits": "default",
20+
"displayName": "GNU Make on Unix-like",
21+
"generator": "Unix Makefiles"
22+
},
1823
{
1924
"name": "clang_gfortran", "inherits": "default",
2025
"displayName": "Clang + GFortran",
@@ -31,6 +36,10 @@
3136
"name": "default",
3237
"configurePreset": "default"
3338
},
39+
{
40+
"name": "gmake",
41+
"configurePreset": "gmake"
42+
},
3443
{
3544
"name": "release",
3645
"configurePreset": "multi",
@@ -63,6 +72,10 @@
6372
"timeout": 15
6473
}
6574
},
75+
{
76+
"name": "gmake", "inherits": "default",
77+
"configurePreset": "gmake"
78+
},
6679
{
6780
"name": "release", "inherits": "default",
6881
"configurePreset": "multi",
@@ -131,6 +144,23 @@
131144
"name": "release"
132145
}
133146
]
147+
},
148+
{
149+
"name": "gmake",
150+
"steps": [
151+
{
152+
"type": "configure",
153+
"name": "gmake"
154+
},
155+
{
156+
"type": "build",
157+
"name": "gmake"
158+
},
159+
{
160+
"type": "test",
161+
"name": "gmake"
162+
}
163+
]
134164
}
135165
]
136166
}

0 commit comments

Comments
 (0)