Skip to content

Commit 342d970

Browse files
committed
fixed compiler versions, used ubuntu version
1 parent 8b9c510 commit 342d970

File tree

2 files changed

+51
-4
lines changed

2 files changed

+51
-4
lines changed

.github/workflows/build_cmake.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
{name: 'Clang 15', preset: clang-15, pkgs: 'clang-15 llvm-15'},
4343
{name: 'Clang 16', preset: clang-16, pkgs: 'clang-16 llvm-16'},
4444
{name: 'Clang 17', preset: clang-17, pkgs: 'clang-17 llvm-17'},
45-
{name: 'Clang 18', preset: clang-18, pkgs: 'clang-18 llvm-18'},
46-
{name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19'}
45+
{name: 'Clang 18', preset: clang-18, pkgs: 'clang-18 llvm-18'}
4746
]
4847
cxx: [17, 20]
4948

@@ -94,7 +93,7 @@ jobs:
9493
strategy:
9594
fail-fast: false # 'false' means Don't stop matrix workflows even if some matrix entry fails.
9695
matrix:
97-
os: [ubuntu-24.04]
96+
os: [ubuntu-22.04]
9897
buildtype: [debug]
9998
compiler: [ {name: 'Clang 12', preset: clang-12, pkgs: 'clang-12 llvm-12'},
10099
{name: 'Clang 13', preset: clang-13, pkgs: 'clang-13 llvm-13'},
@@ -304,7 +303,7 @@ jobs:
304303
matrix:
305304
os: [ubuntu-24.04]
306305
buildtype: [debug]
307-
compiler: [ {name: 'Clang 15', preset: clang-15-qt, pkgs: 'clang-15 llvm-15 llvm-15-dev llvm-15-linker-tools llvm-15-tools llvm-15-runtime'} ]
306+
compiler: [ {name: 'Clang 18', preset: clang-18-qt, pkgs: 'clang-18 llvm-18 llvm-18-dev llvm-18-linker-tools llvm-18-tools llvm-18-runtime'} ]
308307
cxx: [20]
309308

310309
steps:

CMakePresets.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,20 @@
472472
"ENABLE_INCLUDE_WHAT_YOU_USE": "ON"
473473
}
474474
},
475+
{
476+
"name": "unixlike-clang-17-debug-static-analysis",
477+
"displayName": "Clang 17 Debug - Static Analysis",
478+
"description": "Target Unix-like OS with the Clang 17 compiler, debug build type",
479+
"inherits": "unixlike-clang-17-debug",
480+
"cacheVariables": {
481+
"CMAKE_C_COMPILER": "clang-17",
482+
"CMAKE_CXX_COMPILER": "clang++-17",
483+
"CMAKE_BUILD_TYPE": "Debug",
484+
"ENABLE_CPPCHECK": "ON",
485+
"ENABLE_CLANG_TIDY": "ON",
486+
"ENABLE_INCLUDE_WHAT_YOU_USE": "ON"
487+
}
488+
},
475489
{
476490
"name": "gcc-arm-debug",
477491
"displayName": "GCC ARM Debug",
@@ -557,6 +571,24 @@
557571
"NOT_ON_C3I": "1",
558572
"CONFIGURE_QT": "1"
559573
}
574+
},
575+
{
576+
"name": "clang-18-qt",
577+
"displayName": "Clang 18 QT",
578+
"inherits": "conf-unixlike-common",
579+
"cacheVariables": {
580+
"CMAKE_C_COMPILER": "clang-18",
581+
"CMAKE_CXX_COMPILER": "clang++-18",
582+
"CPP_STARTER_USE_SML": "OFF",
583+
"CPP_STARTER_USE_BOOST_BEAST": "OFF",
584+
"CPP_STARTER_USE_CROW": "OFF",
585+
"CPP_STARTER_USE_CPPZMQ_PROTO": "OFF",
586+
"CPP_STARTER_USE_QT": "ON"
587+
},
588+
"environment": {
589+
"NOT_ON_C3I": "1",
590+
"CONFIGURE_QT": "1"
591+
}
560592
}
561593
],
562594
"buildPresets": [
@@ -725,6 +757,11 @@
725757
"displayName": "Linux Clang 15 Debug Static Analysis",
726758
"configurePreset": "unixlike-clang-15-debug-static-analysis"
727759
},
760+
{
761+
"name": "build-unixlike-clang-17-debug-static-analysis",
762+
"displayName": "Linux Clang 17 Debug Static Analysis",
763+
"configurePreset": "unixlike-clang-17-debug-static-analysis"
764+
},
728765
{
729766
"name": "build-gcc-arm-debug",
730767
"displayName": "Linux GCC ARM Debug",
@@ -759,6 +796,11 @@
759796
"name": "build-clang-15-qt",
760797
"displayName": "Linux Clang 15 QT",
761798
"configurePreset": "clang-15-qt"
799+
},
800+
{
801+
"name": "build-clang-18-qt",
802+
"displayName": "Linux Clang 18 QT",
803+
"configurePreset": "clang-18-qt"
762804
}
763805
],
764806
"testPresets": [
@@ -1009,6 +1051,12 @@
10091051
"displayName": "Linux Clang 15 QT",
10101052
"inherits": "test-common",
10111053
"configurePreset": "clang-15-qt"
1054+
},
1055+
{
1056+
"name": "test-clang-18-qt",
1057+
"displayName": "Linux Clang 18 QT",
1058+
"inherits": "test-common",
1059+
"configurePreset": "clang-18-qt"
10121060
}
10131061
]
10141062
}

0 commit comments

Comments
 (0)