consolidate CI and json

Author: scivision

.github/workflows/ci.yml

@@ -1,8 +1,7 @@
 name: ci
 
 env:
-  CTEST_NO_TESTS_ACTION: error
-  CTEST_PARALLEL_LEVEL: 0
+  HOMEBREW_NO_INSTALL_CLEANUP: 1
 
 on:
   push:
@@ -123,33 +122,34 @@ jobs:
     - run: ctest -S memcheck.cmake -VV -E "sleep|string_array|string_view|binding_derived"
 
 
-  linux-flang:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
+    # just saving CI time
+#   linux-flang:
+#     runs-on: ubuntu-latest
+#     timeout-minutes: 15
 
-    strategy:
-      matrix:
-        llvm-version: [21]
+#     strategy:
+#       matrix:
+#         llvm-version: [21]
 
-    steps:
-    - *checkout
+#     steps:
+#     - *checkout
 
-    - name: Apt LLVM
-      run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh ${{ matrix.llvm-version }}
-          sudo apt-get update
+#     - name: Apt LLVM
+#       run: |
+#           wget https://apt.llvm.org/llvm.sh
+#           chmod +x llvm.sh
+#           sudo ./llvm.sh ${{ matrix.llvm-version }}
+#           sudo apt-get update
 
-    - name: install Flang
-      run: sudo apt install --no-install-recommends clang-${{ matrix.llvm-version }} flang-${{ matrix.llvm-version }}
-# MUST specify version here or default old Clang used despite LLVM apt docs
+#     - name: install Flang
+#       run: sudo apt install --no-install-recommends clang-${{ matrix.llvm-version }} flang-${{ matrix.llvm-version }}
+# # MUST specify version here or default old Clang used despite LLVM apt docs
 
-    - uses: ./.github/workflows/composite-unix
-      env:
-        CC: clang-${{ matrix.llvm-version }}
-        CXX: clang++-${{ matrix.llvm-version }}
-        FC: flang-${{ matrix.llvm-version }}
+#     - uses: ./.github/workflows/composite-unix
+#       env:
+#         CC: clang-${{ matrix.llvm-version }}
+#         CXX: clang++-${{ matrix.llvm-version }}
+#         FC: flang-${{ matrix.llvm-version }}
 
 
   mac:
@@ -200,7 +200,7 @@ jobs:
 
     - *checkout
 
-    - run: cmake --workflow ninja
+    - run: cmake --workflow default
 
     - name: upload CMakeConfigureLog.yaml
       if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''

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

@@ -8,7 +8,7 @@ runs:
   steps:
 
   - name: Ninja build and test
-    run: cmake --workflow ninja --fresh
+    run: cmake --workflow default --fresh
     shell: bash
 
   - name: GNU Make build and test

CMakePresets.json

@@ -5,15 +5,13 @@
 {
   "name": "default",
   "binaryDir": "build",
+  "generator": "Ninja",
   "cacheVariables": {
     "CMAKE_BUILD_TYPE": "Release",
     "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"
 },
@@ -37,13 +35,12 @@
 }
 ],
 "buildPresets": [
-  { "name": "default", "configurePreset": "default", "configuration": "Release", "jobs": 0 },
+  { "name": "default", "configurePreset": "default", "configuration": "Release"},
   { "name": "build", "inherits": "default", "configurePreset": "build" },
   { "name": "msvc", "inherits": "default", "configurePreset": "msvc" },
   { "name": "debug", "inherits": "default", "configurePreset": "debug", "configuration": "Debug" },
   { "name": "reldebug", "inherits": "default", "configurePreset": "reldebug", "configuration": "RelWithDebInfo" },
-  { "name": "ninja", "configurePreset": "ninja" },
-  { "name": "gmake", "inherits": "default", "configurePreset": "gmake" }
+  { "name": "gmake", "inherits": "default", "configurePreset": "gmake", "jobs": 4 }
 ],
 "testPresets": [
 {
@@ -73,62 +70,28 @@
   "configurePreset": "debug",
   "configuration": "Debug"
 },
-{ "name": "ninja", "configurePreset": "ninja" },
 { "name": "gmake", "configurePreset": "gmake" }
 ],
 "workflowPresets": [
-  {
-    "name": "default",
-    "displayName": "build and test",
-    "steps": [
+  { "name": "default", "displayName": "build and test", "steps": [
       { "type": "configure", "name": "default" },
       { "type": "build", "name": "default" },
-      { "type": "test", "name": "default" }
-    ]
-  },
-  {
-    "name": "build",
-    "displayName": "build only",
-    "steps": [
+      { "type": "test", "name": "default" } ] },
+  { "name": "build", "displayName": "build only", "steps": [
       { "type": "configure", "name": "build" },
-      { "type": "build", "name": "build" }
-    ]
-  },
-  {
-    "name": "debug",
-    "displayName": "Debug build and test",
-    "steps": [
+      { "type": "build", "name": "build" } ] },
+  { "name": "debug", "displayName": "Debug build and test", "steps": [
       { "type": "configure", "name": "debug" },
       { "type": "build", "name": "debug" },
-      { "type": "test", "name": "debug" }
-    ]
-  },
-  {
-    "name": "msvc",
-    "displayName": "MSVC build and test",
-    "steps": [
+      { "type": "test", "name": "debug" } ] },
+  { "name": "msvc", "displayName": "MSVC build and test", "steps": [
       { "type": "configure", "name": "msvc" },
       { "type": "build", "name": "msvc" },
-      { "type": "test", "name": "msvc" }
-    ]
-  },
-  {
-    "name": "ninja",
-    "displayName": "Ninja build and test",
-    "steps": [
-      { "type": "configure", "name": "ninja" },
-      { "type": "build", "name": "ninja" },
-      { "type": "test", "name": "ninja" }
-    ]
-  },
-  {
-    "name": "gmake",
-    "displayName": "GNU Make build and test",
-    "steps": [
+      { "type": "test", "name": "msvc" } ] },
+  { "name": "gmake", "displayName": "GNU Make build and test", "steps": [
       { "type": "configure", "name": "gmake" },
       { "type": "build", "name": "gmake" },
-      { "type": "test", "name": "gmake" }
-    ]
+      { "type": "test", "name": "gmake" } ]
   }
 ]
 }