From 9be88b308345a15fbeadb017b40acc4252d33624 Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Sun, 8 Dec 2024 17:05:34 -0600
Subject: [PATCH] ci fix

---
 .github/workflows/build-and-test.yml |  4 +-
 CMakePresets.json                    | 89 +++++++++++++++++++++++++++-
 2 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b8fb5822..191efb53 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -33,9 +33,7 @@ jobs:
     - name: cmake
       uses: lukka/run-cmake@v10
       with:
-        configurePreset: "ci-${{matrix.os}}"
-        buildPreset: "default"
-        testPreset: "ci-${{matrix.os}}"
+        workflowPreset: "ci-${{matrix.os}}"
     - name: artifacts
       uses: actions/upload-artifact@v4
       with:
diff --git a/CMakePresets.json b/CMakePresets.json
index 66fb1953..ff2ab560 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -83,12 +83,40 @@
 			"displayName": "Default Build",
 			"description": "Default Build",
 			"jobs": 2
+		},
+		{
+			"name": "windows-msvc",
+			"inherits": "default",
+			"configurePreset": "windows-msvc",
+			"displayName": "Windows (MSVC)",
+			"description": "This preset is used to build using the MSVC toolchain on Windows"
+		},
+		{
+			"name": "linux-clang",
+			"inherits": "default",
+			"configurePreset": "linux-clang",
+			"displayName": "Linux (Clang)",
+			"description": "This preset is used to build using the Clang toolchain on Linux"
+		},
+		{
+			"name": "linux-gnu",
+			"inherits": "default",
+			"configurePreset": "linux-gnu",
+			"displayName": "Linux (GNU)",
+			"description": "This preset is used to build using the GNU toolchain on Linux"
+		},
+		{
+			"name": "macos",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "MacOS",
+			"description": "This preset is used to build on MacOS"
 		}
 	],
 	"testPresets": [
 		{
 			"name": "ci-ubuntu-22.04",
-			"configurePreset": "linux-clang",
+			"configurePreset": "linux-gnu",
 			"displayName": "CI Tests on Linux",
 			"description": "Runs all tests on a linux configuration",
 			"execution": {
@@ -128,5 +156,64 @@
 				}
 			}
 		}
+	],
+	"workflowPresets": [
+		{
+			"name": "ci-windows-2022",
+			"displayName": "Windows (MSVC)",
+			"description": "CI workflow preset for Windows",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "windows-msvc"
+				},
+				{
+					"type": "build",
+					"name": "windows-msvc"
+				},
+				{
+					"type": "test",
+					"name": "ci-windows-2022"
+				}
+			]
+		},
+		{
+			"name": "ci-ubuntu-22.04",
+			"displayName": "Linux (GNU)",
+			"description": "CI workflow preset for Ubuntu",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-gnu"
+				},
+				{
+					"type": "build",
+					"name": "linux-gnu"
+				},
+				{
+					"type": "test",
+					"name": "ci-ubuntu-22.04"
+				}
+			]
+		},
+		{
+			"name": "ci-macos-13",
+			"displayName": "MacOS (Clang)",
+			"description": "CI workflow preset for MacOS",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "macos"
+				},
+				{
+					"type": "build",
+					"name": "macos"
+				},
+				{
+					"type": "test",
+					"name": "ci-macos-13"
+				}
+			]
+		}
 	]
 }