diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 191efb53..b8fb5822 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,7 +33,9 @@ jobs: - name: cmake uses: lukka/run-cmake@v10 with: - workflowPreset: "ci-${{matrix.os}}" + configurePreset: "ci-${{matrix.os}}" + buildPreset: "default" + testPreset: "ci-${{matrix.os}}" - name: artifacts uses: actions/upload-artifact@v4 with: diff --git a/CMakePresets.json b/CMakePresets.json index 2fbc6c70..66fb1953 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -83,34 +83,6 @@ "displayName": "Default Build", "description": "Default Build", "jobs": 2 - }, - { - "name": "windows-msvc-debug", - "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": [ @@ -156,64 +128,5 @@ } } } - ], - "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" - } - ] - } ] }