Add Host-Single-Debug, use for MacOS ci

philips-software · Sep 7, 2023 · b33b504 · b33b504
1 parent 04d633e
commit b33b504
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,13 +53,18 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, windows-2019]
+        include:
+          - visual-studio: "2022"
+            os: "windows-latest"
+          - visual-studio: "2019"
+            os: "windows-2019"
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
         with:
           persist-credentials: false
       - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
         with:
-          vsversion: "2022"
+          vsversion: ${{ matrix.visual-studio }}
       - uses: lukka/run-vcpkg@abed23940f9d7bc267b0e1a21ee7b699a3794baa # v11.1
         with:
           vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 # 2023.04.15
@@ -95,8 +100,8 @@ jobs:
           variant: sccache
       - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
         with:
-          configurePreset: "Host"
-          buildPreset: "Host-Debug"
+          configurePreset: "Host-Single-Debug"
+          buildPreset: "Host-Single-Debug"
           testPreset: "Host"
           configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
       - name: Upload test logs

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -53,7 +53,7 @@ jobs:
       - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
         with:
           configurePreset: "Host-Single-MinSizeRel"
-          buildPreset: "Package"
+          buildPreset: "ReleasePackage"
           configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
       - run: gh release upload ${{ needs.release_please.outputs.tag_name }} build/**/emil-*.zip --clobber
         shell: bash

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -13,7 +13,7 @@
     },
     {
       "name": "Host",
-      "displayName": "Configuration for Host Tooling",
+      "displayName": "Configuration for Host Tooling and Tests",
       "inherits": "defaults",
       "cacheVariables": {
         "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo;MinSizeRel",
@@ -22,9 +22,18 @@
       },
       "generator": "Ninja Multi-Config"
     },
+    {
+      "name": "Host-Single-Debug",
+      "displayName": "Configuration for Host Tooling and Tests, Single Config Generator, Debug",
+      "inherits": "defaults",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "EMIL_ENABLE_DOCKER_TOOLS": "Off"
+      }
+    },
     {
       "name": "Host-Single-MinSizeRel",
-      "displayName": "Configuration for Host Tooling",
+      "displayName": "Configuration for Host Tooling and Tests, Single Config Generator, MinSizeRel",
       "inherits": "defaults",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "MinSizeRel",
@@ -108,27 +117,6 @@
     }
   ],
   "buildPresets": [
-    {
-      "name": "Package",
-      "configuration": "MinSizeRel",
-      "configurePreset": "Host-Single-MinSizeRel",
-      "targets": [ "package" ]
-    },
-    {
-      "name": "Coverage",
-      "configuration": "Debug",
-      "configurePreset": "Coverage"
-    },
-    {
-      "name": "MutationTesting",
-      "configuration": "Debug",
-      "configurePreset": "MutationTesting"
-    },
-    {
-      "name": "Fuzzing",
-      "configuration": "Debug",
-      "configurePreset": "Fuzzing"
-    },
     {
       "name": "Host-Debug",
       "configuration": "Debug",
@@ -155,6 +143,32 @@
       "configuration": "MinSizeRel",
       "configurePreset": "Host"
     },
+    {
+      "name": "Host-Single-Debug",
+      "configuration": "Debug",
+      "configurePreset": "Host-Single-Debug"
+    },
+    {
+      "name": "ReleasePackage",
+      "configuration": "MinSizeRel",
+      "configurePreset": "Host-Single-MinSizeRel",
+      "targets": [ "package" ]
+    },
+    {
+      "name": "Coverage",
+      "configuration": "Debug",
+      "configurePreset": "Coverage"
+    },
+    {
+      "name": "MutationTesting",
+      "configuration": "Debug",
+      "configurePreset": "MutationTesting"
+    },
+    {
+      "name": "Fuzzing",
+      "configuration": "Debug",
+      "configurePreset": "Fuzzing"
+    },
     {
       "name": "HostClangMsvc-Debug",
       "configuration": "Debug",