wip

.github/workflows/windows.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master, test, win32 ]
 
 jobs:
-  build:
+  job:
     runs-on: windows-latest
     strategy:
       matrix:
@@ -27,18 +27,15 @@ jobs:
       with:
         vcpkgGitCommitId: 'f7423ee180c4b7f40d43402c2feb3859161ef625'
         vcpkgTriplet: x64-windows
-        vcpkgJsonGlob: '**/vcpkg.json'
-        runVcpkgInstall: true
+        vcpkgJsonGlob: 'vcpkg.json'
+        runVcpkgInstall: false
 
     - name: Run CMake
       uses: lukka/run-cmake@v10
       with:
-        configurePreset: 'windows-only'
-        configurePresetAdditionalArgs: "['-DCMAKE_CXX_STANDARD=17']"
-        buildPreset: 'windows-only'
-        buildPresetAdditionalArgs: "['--config Release']"
-        testPreset: 'windows-only'
-        testPresetAdditionalArgs: "['--config Release']"
+        configurePreset: 'ninja-multi-vcpkg'
+        buildPreset: 'ninja-vcpkg-release'
+        testPreset: 'test-release'
 
     env:
       VCPKG_DEFAULT_TRIPLET: x64-windows

CMakePresets.json

@@ -1,84 +1,65 @@
 {
-  "version": 6,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 23,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "default",
-      "displayName": "Default Config",
-      "description": "Default build using Ninja generator",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/default",
-      "environment": {
-        "PATH": "$env{HOME}/ninja/bin:$penv{PATH}"
-      }
+    "version": 8,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 21,
+        "patch": 0
     },
-    {
-      "name": "ninja-multi",
-      "inherits": "default",
-      "displayName": "Ninja Multi-Config",
-      "description": "Default build using Ninja Multi-Config generator",
-      "generator": "Ninja Multi-Config"
-    },
-    {
-      "name": "windows-only",
-      "inherits": "default",
-      "displayName": "Windows-only configuration",
-      "description": "This build is only available on Windows",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "default",
-      "configurePreset": "default"
-    }
-  ],
-  "testPresets": [
-    {
-      "name": "default",
-      "configurePreset": "default",
-      "output": {"outputOnFailure": true},
-      "execution": {"noTestsAction": "error", "stopOnFailure": true}
-    }
-  ],
-  "packagePresets": [
-    {
-      "name": "default",
-      "configurePreset": "default",
-      "generators": [
-        "TGZ"
-      ]
-    }
-  ],
-  "workflowPresets": [
-    {
-      "name": "default",
-      "steps": [
+    "configurePresets": [
+        {
+            "name": "ninja-multi-vcpkg",
+            "displayName": "Ninja Multi-Config",
+            "description": "Configure with vcpkg toolchain and generate Ninja project files for all configurations",
+            "binaryDir": "${sourceDir}/builds/${presetName}",
+            "generator": "Ninja Multi-Config",
+            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        }
+    ],
+    "buildPresets": [
         {
-          "type": "configure",
-          "name": "default"
+            "name": "ninja-vcpkg-debug",
+            "configurePreset": "ninja-multi-vcpkg",
+            "displayName": "Build (Debug)",
+            "description": "Build with Ninja/vcpkg (Debug)",
+            "configuration": "Debug"
         },
         {
-          "type": "build",
-          "name": "default"
+            "name": "ninja-vcpkg-release",
+            "configurePreset": "ninja-multi-vcpkg",
+            "displayName": "Build (Release)",
+            "description": "Build with Ninja/vcpkg (Release)",
+            "configuration": "Release"
+        },
+        {
+            "name": "ninja-vcpkg",
+            "configurePreset": "ninja-multi-vcpkg",
+            "displayName": "Build",
+            "description": "Build with Ninja/vcpkg"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "test-ninja-vcpkg",
+            "configurePreset": "ninja-multi-vcpkg",
+            "hidden": true
         },
         {
-          "type": "test",
-          "name": "default"
+            "name": "test-debug",
+            "description": "Test (Debug)",
+            "displayName": "Test (Debug)",
+            "configuration": "Debug",
+            "inherits": [
+                "test-ninja-vcpkg"
+            ]
         },
         {
-          "type": "package",
-          "name": "default"
+            "name": "test-release",
+            "description": "Test (Release)",
+            "displayName": "Test (Release)",
+            "configuration": "Release",
+            "inherits": [
+                "test-ninja-vcpkg"
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }