Skip to content

Commit 0b73d66

Browse files
committed
Add macos to matrix. Update names
1 parent 031c051 commit 0b73d66

File tree

1 file changed

+29
-3
lines changed

1 file changed

+29
-3
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build:
2323
# Skip CI if PR is a draft
2424
if: github.event.pull_request.draft == false
25-
name: build-${{matrix.os}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}}
25+
name: build (${{matrix.os}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}})
2626
# The CMake configure and build commands are platform agnostic and should work equally
2727
# well on Windows or Mac. You can convert this to a matrix build if you need
2828
# cross-platform coverage.
@@ -36,16 +36,29 @@ jobs:
3636
matrix:
3737
os:
3838
- ubuntu-22.04
39+
- macos-14
3940
cc:
4041
- gcc-12
42+
- clang
4143
cxx:
4244
- g++-12
45+
- clang
4346
mpi:
4447
- "ON"
4548
- "OFF"
4649
omp:
4750
- "ON"
4851
- "OFF"
52+
exclude:
53+
- cc: gcc-12
54+
cxx: clang
55+
- cc: clang
56+
cxx: g++-12
57+
- os: macos-14
58+
cc: gcc-12
59+
cxx: g++-12
60+
- os: macos-14
61+
omp: "ON"
4962

5063
steps:
5164
- uses: actions/checkout@v4
@@ -135,7 +148,7 @@ jobs:
135148
test:
136149
needs:
137150
build
138-
name: test-${{matrix.os}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}}
151+
name: test (${{matrix.os}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}})
139152
runs-on: ${{matrix.os}}
140153
env:
141154
CC: ${{ matrix.cc }}
@@ -145,22 +158,34 @@ jobs:
145158
matrix:
146159
os:
147160
- ubuntu-22.04
161+
- macos-14
148162
cc:
149163
- gcc-12
164+
- clang
150165
cxx:
151166
- g++-12
167+
- clang
152168
mpi:
153169
- "ON"
154170
- "OFF"
155171
omp:
156172
- "ON"
157173
- "OFF"
174+
exclude:
175+
- cc: gcc-12
176+
cxx: clang
177+
- cc: clang
178+
cxx: g++-12
179+
- os: macos-14
180+
cc: gcc-12
181+
cxx: g++-12
182+
- os: macos-14
183+
omp: "ON"
158184
steps:
159185
- uses: actions/checkout@v4
160186

161187
- uses: actions/download-artifact@v4
162188
with:
163-
name: dependencies-${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
164189
path: ${{github.workspace}}/local
165190

166191
- name: Install Dependencies on Ubunutu
@@ -196,6 +221,7 @@ jobs:
196221
doc:
197222
needs:
198223
build
224+
name: doc (${{matrix.os}}-${{matrix.cxx}}-mpi:${{matrix.mpi}}-openmp:${{matrix.omp}})
199225
runs-on: ${{matrix.os}}
200226
env:
201227
CC: ${{ matrix.cc }}

0 commit comments

Comments
 (0)