ci: better presets

Author: scivision

.github/workflows/ci.yml

@@ -3,7 +3,6 @@ name: ci
 env:
   CTEST_NO_TESTS_ACTION: error
   CTEST_PARALLEL_LEVEL: 0
-  CMAKE_BUILD_PARALLEL_LEVEL: 4
 
 on:
   push:
@@ -201,9 +200,7 @@ jobs:
 
     - *checkout
 
-    - run: cmake --workflow default
-      env:
-        CMAKE_GENERATOR: Ninja
+    - run: cmake --workflow ninja
 
     - name: upload CMakeConfigureLog.yaml
       if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''

.github/workflows/composite-unix/action.yml

@@ -5,16 +5,12 @@ runs:
   steps:
 
   - name: Ninja build and test
-    run: cmake --workflow default --fresh
+    run: cmake --workflow ninja --fresh
     shell: bash
-    env:
-      CMAKE_GENERATOR: Ninja
 
   - name: GNU Make build and test
-    run: cmake --workflow default --fresh
+    run: cmake --workflow gmake --fresh
     shell: bash
-    env:
-      CMAKE_GENERATOR: "Unix Makefiles"
 
   - name: upload CMakeConfigureLog.yaml
     if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''

CMakePresets.json

@@ -9,6 +9,12 @@
     "CMAKE_COMPILE_WARNING_AS_ERROR": true,
     "CMAKE_LINK_WARNING_AS_ERROR": true
   }
+},
+{ "name": "ninja", "inherits": "default",
+  "generator": "Ninja"
+},
+{ "name": "gmake", "inherits": "default",
+  "generator": "Unix Makefiles"
 }
 ],
 "buildPresets": [
@@ -31,7 +37,9 @@
     "name": "debug",
     "configurePreset": "default",
     "configuration": "Debug"
-  }
+  },
+  { "name": "ninja", "configurePreset": "ninja" },
+  { "name": "gmake", "configurePreset": "gmake" }
 ],
 "testPresets": [
 {
@@ -63,58 +71,50 @@
   "name": "debug", "inherits": "default",
   "configurePreset": "default",
   "configuration": "Debug"
-}
+},
+{ "name": "ninja", "configurePreset": "ninja" },
+{ "name": "gmake", "configurePreset": "gmake" }
 ],
 "workflowPresets": [
   {
     "name": "default",
     "steps": [
-      {
-        "type": "configure",
-        "name": "default"
-      },
-      {
-        "type": "build",
-        "name": "default"
-      },
-      {
-        "type": "test",
-        "name": "default"
-      }
+      { "type": "configure", "name": "default" },
+      { "type": "build", "name": "default" },
+      { "type": "test", "name": "default" }
+
     ]
   },
   {
     "name": "debug",
     "steps": [
-      {
-        "type": "configure",
-        "name": "default"
-      },
-      {
-        "type": "build",
-        "name": "debug"
-      },
-      {
-        "type": "test",
-        "name": "debug"
-      }
+      { "type": "configure", "name": "default" },
+      { "type": "build", "name": "debug" },
+      { "type": "test", "name": "debug" }
     ]
   },
   {
     "name": "release",
     "steps": [
-      {
-        "type": "configure",
-        "name": "default"
-      },
-      {
-        "type": "build",
-        "name": "release"
-      },
-      {
-        "type": "test",
-        "name": "release"
-      }
+      { "type": "configure", "name": "default" },
+      { "type": "build", "name": "release" },
+      { "type": "test", "name": "release" }
+    ]
+  },
+  {
+    "name": "ninja",
+    "steps": [
+      { "type": "configure", "name": "ninja" },
+      { "type": "build", "name": "ninja" },
+      { "type": "test", "name": "ninja" }
+    ]
+  },
+  {
+    "name": "gmake",
+    "steps": [
+      { "type": "configure", "name": "gmake" },
+      { "type": "build", "name": "gmake" },
+      { "type": "test", "name": "gmake" }
     ]
   }
 ]