Skip to content

Commit afff244

Browse files
committed
Simplify CI
1 parent f25ad44 commit afff244

1 file changed

Lines changed: 5 additions & 32 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,14 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
compiler: [gcc, clang]
24-
include:
25-
- compiler: gcc
26-
cc: gcc
27-
cxx: g++
28-
- compiler: clang
29-
cc: clang
30-
cxx: clang++
3124

3225
steps:
3326
- uses: actions/checkout@v4
3427
with:
3528
submodules: recursive
3629

3730
- name: Build
38-
env:
39-
CC: ${{ matrix.cc }}
40-
CXX: ${{ matrix.cxx }}
41-
run: make
31+
run: make CXX=${{ matrix.compiler == 'gcc' && 'g++' || 'clang++' }} CC=${{ matrix.compiler }}
4232

4333
- name: Run tests
4434
run: make check
@@ -48,27 +38,12 @@ jobs:
4838

4939
build-macos:
5040
runs-on: macos-latest
51-
strategy:
52-
fail-fast: false
53-
matrix:
54-
compiler: [clang, gcc]
55-
include:
56-
- compiler: clang
57-
cc: clang
58-
cxx: clang++
59-
- compiler: gcc
60-
cc: gcc-13
61-
cxx: g++-13
62-
6341
steps:
6442
- uses: actions/checkout@v4
6543
with:
6644
submodules: recursive
6745

6846
- name: Build
69-
env:
70-
CC: ${{ matrix.cc }}
71-
CXX: ${{ matrix.cxx }}
7247
run: make
7348

7449
- name: Run tests
@@ -86,7 +61,7 @@ jobs:
8661

8762
- name: Build (MinGW)
8863
shell: bash
89-
run: make CXX=g++ CC=gcc
64+
run: make
9065

9166
- name: Run tests
9267
shell: bash
@@ -100,17 +75,16 @@ jobs:
10075
runs-on: ubuntu-latest
10176
steps:
10277
- uses: actions/checkout@v4
103-
with:
104-
submodules: recursive
10578

10679
- name: Build and test on FreeBSD
10780
uses: vmactions/freebsd-vm@v1
10881
with:
10982
usesh: true
11083
prepare: |
111-
pkg install -y gmake
84+
pkg install -y gmake git
11285
run: |
113-
gmake CXX=clang++ CC=clang
86+
git submodule update --init --recursive
87+
gmake
11488
gmake check
11589
gmake run-examples
11690
@@ -133,4 +107,3 @@ jobs:
133107

134108
- name: Run examples
135109
run: make run-examples
136-

0 commit comments

Comments
 (0)