Skip to content

Commit f8dad60

Browse files
committed
update macos ci
1 parent adeefe6 commit f8dad60

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

.github/workflows/MacOs.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,36 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
compiler: [
25+
{ tool: apple-clang },
2526
{ tool: llvm, ver: 12 },
2627
{ tool: llvm, ver: 13 },
2728
{ tool: llvm, ver: 14 },
2829
{ tool: llvm, ver: 15 },
2930
{ tool: llvm, ver: 16 },
3031
{ tool: llvm, ver: 17 },
31-
{ tool: llvm, ver: 18 } ]
32+
{ tool: llvm, ver: 18 }
33+
{ tool: gcc, ver: 10 },
34+
{ tool: gcc, ver: 11 },
35+
{ tool: gcc, ver: 12 },
36+
{ tool: gcc, ver: 13 },
37+
{ tool: gcc, ver: 14 } ]
3238
build_type: [ Release ]
3339
os: [ macos-12, macos-13, macos-14 ]
3440
std: [ 17, 20, 23 ]
3541
library_type: [ Static ]
3642
include:
43+
- compiler: { tool: gcc }
44+
cxx: g++
45+
cc: gcc
3746
- compiler: { tool: llvm }
3847
cxx: clang++
3948
cc: clang
49+
- compiler: { tool: apple-clang }
50+
cxx: ''
51+
cc: ''
52+
exclude:
53+
- { os: macos-14, compiler: { tool: gcc, ver: 10 } }
54+
- { compiler: { tool: gcc, ver: 10 }, std: 23 }
4055

4156
runs-on: ${{matrix.os}}
4257
steps:
@@ -56,8 +71,8 @@ jobs:
5671
5772
- name: Configure
5873
env:
59-
CXX: ${{matrix.cxx}}
60-
CC: ${{matrix.cc}}
74+
CXX: "${{ matrix.compiler.tool == 'gcc' && format('{}-{}', matrix.cxx, matrix.compiler.ver) || matrix.cxx }}"
75+
CC: "${{ matrix.compiler.tool == 'gcc' && format('{}-{}', matrix.cc, matrix.compiler.ver) || matrix.cc }}"
6176
run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
6277

6378
- name: Build

0 commit comments

Comments
 (0)