more effective cmake presets

Author: scivision

.github/workflows/ci_windows.yml

@@ -57,8 +57,9 @@ jobs:
 
     - name: Upload log failure
       if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
+        archive: false
         name: example-${{ runner.os }}-CMakeConfigureLog.yaml
         path: example/build/CMakeFiles/CMakeConfigureLog.yaml
 
@@ -114,8 +115,9 @@ jobs:
 
     - name: Upload log failure
       if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v
       with:
+        archive: false
         name: example-${{ runner.os }}-CMakeConfigureLog.yaml
         path: /tmp/build-ex/CMakeFiles/CMakeConfigureLog.yaml
 

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

@@ -2,49 +2,40 @@ name: build example
 description: Build and test MUMPS example workflow
 
 runs:
-  using: "composite"
+  using: composite
 
   steps:
 
   - name: configure example
     shell: bash
-    run: cmake -S example -B example/build
-
-  - name: build example
-    shell: bash
-    run: cmake --build example/build
-
-  - name: test example
-    shell: bash
-    run: ctest --test-dir example/build -V
+    working-directory: example
+    run: cmake --workflow default
 
   - name: Scotch example
     shell: bash
     if: ${{ matrix.scotch }}
-    run: |
-      cmake -S example/scotch -Bexample/scotch/build
-      cmake --build example/scotch/build
-      ctest --test-dir example/scotch/build -V
+    working-directory: example/scotch
+    run: cmake --workflow default
 
   - name: Upload log failure
     if: ${{ failure() && matrix.scotch }}
-    uses: actions/upload-artifact@v6
+    uses: actions/upload-artifact@v7
     with:
+      archive: false
       name: Scotch-example-${{ runner.os }}-CMakeConfigureLog.yaml
       path: example/scotch/build/CMakeFiles/CMakeConfigureLog.yaml
 
   - name: METIS example
     shell: bash
     if: ${{ matrix.metis }}
-    run: |
-      cmake -S example/metis -Bexample/metis/build
-      cmake --build example/metis/build
-      ctest --test-dir example/metis/build -V
+    working-directory: example/metis
+    run: cmake --workflow default
 
   - name: Upload log failure
     if: ${{ failure() && matrix.metis }}
-    uses: actions/upload-artifact@v6
+    uses: actions/upload-artifact@v7
     with:
+      archive: false
       name: METIS-example-${{ runner.os }}-CMakeConfigureLog.yaml
       path: example/metis/build/CMakeFiles/CMakeConfigureLog.yaml
 
@@ -59,7 +50,8 @@ runs:
 
   - name: Upload log failure
     if: ${{ failure() && matrix.openmp }}
-    uses: actions/upload-artifact@v6
+    uses: actions/upload-artifact@v7
     with:
+      archive: false
       name: OpenMP-example-${{ runner.os }}-CMakeConfigureLog.yaml
       path: example/openmp/build/CMakeFiles/CMakeConfigureLog.yaml

.github/workflows/oneapi-linux.yml

@@ -90,8 +90,9 @@ jobs:
 
     - name: Upload log failure
       if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
+        archive: false
         name: oneapi-${{ matrix.oneapi }}-${{ runner.os }}-CMakeConfigureLog.yaml
         path: build/CMakeFiles/CMakeConfigureLog.yaml
 

CMakePresets.json

@@ -12,13 +12,18 @@
     "BUILD_COMPLEX16": false,
     "CMAKE_BUILD_TYPE": "Release"
   }
+},
+{
+  "name": "shared", "inherits": "default",
+  "binaryDir": "${sourceDir}/build-shared",
+  "cacheVariables": {
+    "BUILD_SHARED_LIBS": true
+  }
 }
 ],
 "buildPresets": [
-  {
-    "name": "default",
-    "configurePreset": "default"
-  }
+  { "name": "default", "configurePreset": "default", "jobs": 0 },
+  { "name": "shared", "configurePreset": "shared", "inherits": "default" }
 ],
 "testPresets": [
 {
@@ -34,24 +39,24 @@
     "stopOnFailure": false,
     "timeout": 60
   }
-}
+},
+{ "name": "shared", "configurePreset": "shared", "inherits": "default" }
 ],
 "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": "shared",
+    "steps": [
+      { "type": "configure", "name": "shared" },
+      { "type": "build", "name": "shared" },
+      { "type": "test", "name": "shared"}
     ]
   }
 ]

example/CMakePresets.json

@@ -1,51 +1,6 @@
 {
   "version": 6,
-
-"configurePresets": [
-{
-  "name": "default",
-  "binaryDir": "${sourceDir}/build"
-}
-],
-"buildPresets": [
-  {
-    "name": "default",
-    "configurePreset": "default"
-  }
-],
-"testPresets": [
-{
-  "name": "default",
-  "configurePreset": "default",
-  "output": {
-    "outputOnFailure": true,
-    "verbosity": "verbose"
-  },
-  "execution": {
-    "noTestsAction": "error",
-    "scheduleRandom": true,
-    "stopOnFailure": false,
-    "timeout": 60
-  }
-}
-],
-"workflowPresets": [
-  {
-    "name": "default",
-    "steps": [
-      {
-        "type": "configure",
-        "name": "default"
-      },
-      {
-        "type": "build",
-        "name": "default"
-      },
-      {
-        "type": "test",
-        "name": "default"
-      }
-    ]
-  }
-]
+  "include": [
+    "../CMakePresets.json"
+  ]
 }

example/metis/CMakePresets.json

@@ -0,0 +1,6 @@
+{
+  "version": 6,
+  "include": [
+    "../CMakePresets.json"
+  ]
+}

example/scotch/CMakePresets.json

@@ -0,0 +1,6 @@
+{
+  "version": 6,
+  "include": [
+    "../CMakePresets.json"
+  ]
+}