Skip to content

Commit a42d12b

Browse files
committed
Use cmake_additional_param
1 parent ca0ad1f commit a42d12b

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.github/workflows/cpp-ci-serial-programs.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,25 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [windows-2025, macos-13, ubuntu-24.04]
13-
toolset: ['']
13+
compiler: ['default', 'clang']
1414
qt_version: ['6.9.0']
1515
include:
1616
- qt_version: '6.9.0'
1717
qt_version_major: '6'
1818
qt_modules: 'qtmultimedia qtserialport'
1919

2020
- os: 'windows-2025'
21-
toolset: '-T ClangCL'
21+
compiler: 'clang'
22+
cmake_additional_param: '-T ClangCL'
23+
24+
- os: 'ubuntu-24.04'
25+
compiler: 'clang'
26+
cmake_additional_param: '-DCMAKE_CXX_COMPILER=clang++'
27+
28+
exclude:
29+
- os: 'macos-13'
30+
compiler: 'clang'
31+
# Excluded because macos default toolset is already clang
2232

2333
steps:
2434
- uses: actions/checkout@v4
@@ -46,7 +56,7 @@ jobs:
4656
cd Arduino-Source/SerialPrograms
4757
mkdir bin
4858
cd bin
49-
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }} ${{ matrix.toolset }}
59+
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }} ${{ matrix.cmake_additional_param }}
5060
cmake --build . --config Release --parallel 10
5161
- name: Copy resources
5262
if: startsWith(matrix.os, 'windows')

0 commit comments

Comments
 (0)