Skip to content

Commit 1e6b9ca

Browse files
committed
[cicd_cmake_multi_platform.yml] fix: matrix
1 parent 95b1696 commit 1e6b9ca

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

.github/workflows/cicd_cmake_multi_platform.yml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,65 +34,60 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
gen: [Ninja] ## default generator
38-
# cc : [gcc, clang] ## compilers
39-
bt : [Release, Debug] ## build type
40-
# pl : [ubuntu-latest, macos-latest] ## platform
41-
# exclude:
42-
# - pl : windows-latest
43-
# cc : gcc
44-
# - pl : windows-latest
45-
# cc : clang
37+
bt : [Debug, Release] ## build type
4638
include:
4739
- name: "ubuntu gcc"
4840
pl : ubuntu-latest
4941
cc : gcc
5042
cxx: g++
5143
bp : "lnx_gcc"
52-
# bt : Debug
44+
gen: "Ninja"
5345
- name: "ubuntu clang"
5446
pl : ubuntu-latest
5547
cc : clang
5648
cxx: clang++
5749
bp : "lnx_clang"
58-
# bt : Debug
50+
gen: "Ninja"
5951
- name: "macOS gcc"
6052
pl : macos-latest
6153
cc : gcc
6254
cxx: g++
6355
bp : "mac_gcc"
64-
# bt : Debug
56+
gen: "Ninja"
6557
- name: "macOS clang"
6658
pl : macos-latest
6759
cc : clang
6860
cxx: clang++
6961
bp : "mac_clang"
70-
# bt : Debug
62+
gen: "Ninja"
7163
- name: "macOS Xcode"
7264
pl : macos-latest
7365
cc : cc
7466
cxx: c++
7567
bp : "mac_Xcode"
7668
gen: "Xcode"
77-
# bt : Debug
78-
- name: "win10 MSVC"
79-
pl : windows-2022 # drmemory currently not works on windows-2025 - Dr. Memory internal crash at PC.
69+
- name: "win11 clang"
70+
pl : windows-latest
71+
cc : clang
72+
cxx: clang++
73+
bp : "win11_clang"
74+
gen: "Ninja"
75+
- name: "win11 MSVC"
76+
pl : windows-latest
8077
cc : cl
8178
cxx: cl
82-
bp : "win10_cl"
79+
bp : "win11_cl"
8380
gen: "Visual Studio 17 2022"
84-
# bt : Debug
85-
- name: "win11 MSVC"
86-
pl : windows-2025 # drmemory currently not works on windows-2025 - Dr. Memory internal crash at PC.
81+
- name: "win10 MSVC"
82+
pl : windows-2022
8783
cc : cl
8884
cxx: cl
89-
bp : "win11_cl"
85+
bp : "win10_cl"
9086
gen: "Visual Studio 17 2022"
91-
# bt : Debug
9287
## END include
9388
## END matrix
9489
## END strategy
95-
runs-on: ${{ matrix.pl }}
90+
runs-on : ${{ matrix.bp }}
9691

9792
name: "${{ matrix.bp }}_${{ matrix.bt }} | CC=${{ matrix.cc }} CXX=${{ matrix.cxx }} | ${{ matrix.pl }}"
9893
steps:
@@ -263,8 +258,9 @@ jobs:
263258
working-directory: ${{ steps.str2.outputs.dir_path_build }}
264259
run: ctest --build-config ${{ matrix.bt }} --output-on-failure
265260

261+
## drmemory currently not works on windows-latest/windows-2025 => Dr. Memory internal crash at PC 0x*.
266262
- name: Memcheck
267-
if : ${{ matrix.bt == 'Debug' }}
263+
if : ${{ matrix.bt == 'Debug' && matrix.pl != 'windows-latest' }}
268264
working-directory: ${{ steps.str2.outputs.dir_path_build }}
269265
run : cmake --build . --config ${{ matrix.bt }} --target memcheck
270266

0 commit comments

Comments
 (0)