fixed compiler versions, used ubuntu version

StephanKa · Nov 20, 2024 · 342d970 · 342d970
1 parent 8b9c510
commit 342d970
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -42,8 +42,7 @@ jobs:
                     {name: 'Clang 15', preset: clang-15, pkgs: 'clang-15 llvm-15'},
                     {name: 'Clang 16', preset: clang-16, pkgs: 'clang-16 llvm-16'},
                     {name: 'Clang 17', preset: clang-17, pkgs: 'clang-17 llvm-17'},
-                    {name: 'Clang 18', preset: clang-18, pkgs: 'clang-18 llvm-18'},
-                    {name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19'}
+                    {name: 'Clang 18', preset: clang-18, pkgs: 'clang-18 llvm-18'}
                   ]
         cxx: [17, 20]
 
@@ -94,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false  # 'false' means Don't stop matrix workflows even if some matrix entry fails.
       matrix:
-        os: [ubuntu-24.04]
+        os: [ubuntu-22.04]
         buildtype: [debug]
         compiler: [ {name: 'Clang 12', preset: clang-12, pkgs: 'clang-12 llvm-12'},
                     {name: 'Clang 13', preset: clang-13, pkgs: 'clang-13 llvm-13'},
@@ -304,7 +303,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
         buildtype: [debug]
-        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'} ]
+        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'} ]
         cxx: [20]
 
     steps:

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -472,6 +472,20 @@
         "ENABLE_INCLUDE_WHAT_YOU_USE": "ON"
       }
     },
+    {
+      "name": "unixlike-clang-17-debug-static-analysis",
+      "displayName": "Clang 17 Debug - Static Analysis",
+      "description": "Target Unix-like OS with the Clang 17 compiler, debug build type",
+      "inherits": "unixlike-clang-17-debug",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang-17",
+        "CMAKE_CXX_COMPILER": "clang++-17",
+        "CMAKE_BUILD_TYPE": "Debug",
+        "ENABLE_CPPCHECK": "ON",
+        "ENABLE_CLANG_TIDY": "ON",
+        "ENABLE_INCLUDE_WHAT_YOU_USE": "ON"
+      }
+    },
     {
       "name": "gcc-arm-debug",
       "displayName": "GCC ARM Debug",
@@ -557,6 +571,24 @@
         "NOT_ON_C3I": "1",
         "CONFIGURE_QT": "1"
       }
+    },
+    {
+      "name": "clang-18-qt",
+      "displayName": "Clang 18 QT",
+      "inherits": "conf-unixlike-common",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "clang-18",
+        "CMAKE_CXX_COMPILER": "clang++-18",
+        "CPP_STARTER_USE_SML": "OFF",
+        "CPP_STARTER_USE_BOOST_BEAST": "OFF",
+        "CPP_STARTER_USE_CROW": "OFF",
+        "CPP_STARTER_USE_CPPZMQ_PROTO": "OFF",
+        "CPP_STARTER_USE_QT": "ON"
+      },
+      "environment": {
+        "NOT_ON_C3I": "1",
+        "CONFIGURE_QT": "1"
+      }
     }
   ],
   "buildPresets": [
@@ -725,6 +757,11 @@
       "displayName": "Linux Clang 15 Debug Static Analysis",
       "configurePreset": "unixlike-clang-15-debug-static-analysis"
     },
+    {
+      "name": "build-unixlike-clang-17-debug-static-analysis",
+      "displayName": "Linux Clang 17 Debug Static Analysis",
+      "configurePreset": "unixlike-clang-17-debug-static-analysis"
+    },
     {
       "name": "build-gcc-arm-debug",
       "displayName": "Linux GCC ARM Debug",
@@ -759,6 +796,11 @@
       "name": "build-clang-15-qt",
       "displayName": "Linux Clang 15 QT",
       "configurePreset": "clang-15-qt"
+    },
+    {
+      "name": "build-clang-18-qt",
+      "displayName": "Linux Clang 18 QT",
+      "configurePreset": "clang-18-qt"
     }
   ],
   "testPresets": [
@@ -1009,6 +1051,12 @@
       "displayName": "Linux Clang 15 QT",
       "inherits": "test-common",
       "configurePreset": "clang-15-qt"
+    },
+    {
+      "name": "test-clang-18-qt",
+      "displayName": "Linux Clang 18 QT",
+      "inherits": "test-common",
+      "configurePreset": "clang-18-qt"
     }
   ]
 }