ci: consolidate configurations

.github/workflows/ci.yml

@@ -29,29 +29,67 @@ jobs:
         with:
           key: ${{ github.job }}-ubuntu-latest
           variant: sccache
+      - uses: seanmiddleditch/gha-setup-ninja@16b940825621068d98711680b6c3ff92201f8fc0 # v3
       - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
         with:
-          configurePreset: "ContinuousIntegration"
-          buildPreset: "ContinuousIntegrationWithPackage"
-          testPreset: "ContinuousIntegration"
+          configurePreset: "Host"
+          buildPreset: "Host-Debug-WithPackage"
+          testPreset: "Host"
           configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
       - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: emil
-          path: build/ContinuousIntegration/emil-*-Linux.tar.gz
+          path: build/Host/emil-*-Linux.tar.gz
           if-no-files-found: error
       - name: Upload test logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: test-logs
-          path: build/ContinuousIntegration/Testing/Temporary/
-  host_build_test:
+          path: build/Host/Testing/Temporary/
+  host_build_test_windows:
     name: Host Build & Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, windows-2019]
+        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: ${{ matrix.visual-studio }}
+      - uses: lukka/run-vcpkg@abed23940f9d7bc267b0e1a21ee7b699a3794baa # v11.1
+        with:
+          vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 # 2023.04.15
+      - uses: hendrikmuhs/ccache-action@6d1841ec156c39a52b1b23a810da917ab98da1f4 # v1.2.10
+        with:
+          key: ${{ github.job }}-${{ matrix.os }}
+          variant: sccache
+      - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
+        with:
+          configurePreset: "Host"
+          buildPreset: "Host-Debug"
+          testPreset: "Host"
+          configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
+      - name: Upload test logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        with:
+          name: test-logs
+          path: build/Host/Testing/Temporary/
+  host_build_test_macos:
+    name: Host Build & Test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
         with:
@@ -62,16 +100,16 @@ jobs:
           variant: sccache
       - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
         with:
-          configurePreset: "ContinuousIntegration"
-          buildPreset: "ContinuousIntegration"
-          testPreset: "ContinuousIntegration"
+          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
         if: ${{ failure() }}
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           name: test-logs
-          path: build/ContinuousIntegration/Testing/Temporary/
+          path: build/Host/Testing/Temporary/
   embedded_build:
     name: Embedded Build
     runs-on: ubuntu-latest

.github/workflows/release-please.yml

@@ -52,8 +52,8 @@ jobs:
           variant: sccache
       - uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
         with:
-          configurePreset: "Package"
-          buildPreset: "Package"
+          configurePreset: "Host-Single-MinSizeRel"
+          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

.github/workflows/static-analysis.yml

@@ -84,6 +84,6 @@ jobs:
         with:
           languages: cpp
       - run: |
-          cmake --preset ContinuousIntegration -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build --preset ContinuousIntegration
+          cmake --preset Host -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake --build --preset Host-Debug
       - uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5

CMakePresets.json

@@ -12,30 +12,38 @@
       }
     },
     {
-      "name": "ContinuousIntegration",
-      "displayName": "Configuration for Continuous Integration",
+      "name": "Host",
+      "displayName": "Configuration for Host Tooling and Tests",
       "inherits": "defaults",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "EMIL_ENABLE_DOCKER_TOOLS": "Off",
+        "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo;MinSizeRel",
+        "EMIL_BUILD_TESTS": "On",
         "EMIL_BUILD_EXAMPLES": "On"
+      },
+      "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": "Package",
-      "displayName": "Configuration for CPack package generation",
+      "name": "Host-Single-MinSizeRel",
+      "displayName": "Configuration for Host Tooling and Tests, Single Config Generator, MinSizeRel",
       "inherits": "defaults",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "MinSizeRel",
-        "EMIL_ENABLE_DOCKER_TOOLS": "Off",
-        "EMIL_BUILD_TESTS": "Off",
-        "EMIL_BUILD_EXAMPLES": "Off"
+        "EMIL_ENABLE_DOCKER_TOOLS": "Off"
       }
     },
     {
       "name": "Coverage",
       "displayName": "Configuration for Code Coverage",
-      "inherits": "ContinuousIntegration",
+      "inherits": "Host",
       "cacheVariables": {
         "EMIL_ENABLE_COVERAGE": "On"
       },
@@ -44,7 +52,7 @@
     {
       "name": "MutationTesting",
       "displayName": "Configuration for Mutation Testing",
-      "inherits": "ContinuousIntegration",
+      "inherits": "Host",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "clang-12",
         "CMAKE_CXX_COMPILER": "clang++-12",
@@ -56,7 +64,7 @@
     {
       "name": "Fuzzing",
       "displayName": "Configuration for Fuzzing",
-      "inherits": "ContinuousIntegration",
+      "inherits": "Host",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "clang",
         "CMAKE_CXX_COMPILER": "clang++",
@@ -66,17 +74,6 @@
       },
       "generator": "Ninja"
     },
-    {
-      "name": "Host",
-      "displayName": "Configuration for Host Tooling",
-      "inherits": "defaults",
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release;RelWithDebInfo;MinSizeRel",
-        "EMIL_BUILD_TESTS": "Off",
-        "EMIL_BUILD_EXAMPLES": "Off"
-      },
-      "generator": "Ninja Multi-Config"
-    },
     {
       "name": "HostClangMsvc",
       "displayName": "Configuration for Host Tooling using clang-cl to target Windows",
@@ -121,21 +118,41 @@
   ],
   "buildPresets": [
     {
-      "name": "ContinuousIntegration",
+      "name": "Host-Debug",
       "configuration": "Debug",
-      "configurePreset": "ContinuousIntegration"
+      "configurePreset": "Host"
     },
     {
-      "name": "ContinuousIntegrationWithPackage",
+      "name": "Host-Debug-WithPackage",
       "configuration": "Debug",
-      "configurePreset": "ContinuousIntegration",
-      "targets": ["all", "package"]
+      "configurePreset": "Host",
+      "targets": [ "all", "package" ]
     },
     {
-      "name": "Package",
+      "name": "Host-Release",
+      "configuration": "Release",
+      "configurePreset": "Host"
+    },
+    {
+      "name": "Host-RelWithDebInfo",
+      "configuration": "RelWithDebInfo",
+      "configurePreset": "Host"
+    },
+    {
+      "name": "Host-MinSizeRel",
+      "configuration": "MinSizeRel",
+      "configurePreset": "Host"
+    },
+    {
+      "name": "Host-Single-Debug",
+      "configuration": "Debug",
+      "configurePreset": "Host-Single-Debug"
+    },
+    {
+      "name": "ReleasePackage",
       "configuration": "MinSizeRel",
-      "configurePreset": "Package",
-      "targets": ["package"]
+      "configurePreset": "Host-Single-MinSizeRel",
+      "targets": [ "package" ]
     },
     {
       "name": "Coverage",
@@ -152,26 +169,6 @@
       "configuration": "Debug",
       "configurePreset": "Fuzzing"
     },
-    {
-      "name": "Host-Debug",
-      "configuration": "Debug",
-      "configurePreset": "Host"
-    },
-    {
-      "name": "Host-Release",
-      "configuration": "Release",
-      "configurePreset": "Host"
-    },
-    {
-      "name": "Host-RelWithDebInfo",
-      "configuration": "RelWithDebInfo",
-      "configurePreset": "Host"
-    },
-    {
-      "name": "Host-MinSizeRel",
-      "configuration": "MinSizeRel",
-      "configurePreset": "Host"
-    },
     {
       "name": "HostClangMsvc-Debug",
       "configuration": "Debug",
@@ -226,8 +223,8 @@
       }
     },
     {
-      "name": "ContinuousIntegration",
-      "configurePreset": "ContinuousIntegration",
+      "name": "Host",
+      "configurePreset": "Host",
       "configuration": "Debug",
       "inherits": "defaults"
     },