diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 8bf7d2b5..cc168e5a 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -11,7 +11,7 @@ env: VCPKG_COMMIT_ID: 095ee8757ec933b22d445738d2dbb1ce89bb8021 jobs: - build-and-test-vcpkg: + build: runs-on: windows-latest strategy: fail-fast: false @@ -37,7 +37,7 @@ jobs: cmake-version: "3.26" - name: Generate - run: cmake -B "${{ github.workspace }}/build" -S "${{ github.workspace }}/CommonLibSF" --preset=build-release-${{ matrix.compiler }} + run: cmake -B "${{ github.workspace }}/build" -S "${{ github.workspace }}/CommonLibSF" --preset=build-release-${{ matrix.compiler }}-ninja - name: Build - run: cmake --build "${{ github.workspace }}/build" --config release + run: cmake --build "${{ github.workspace }}/build" diff --git a/CommonLibSF/CMakePresets.json b/CommonLibSF/CMakePresets.json index 3a38fe27..343f754c 100644 --- a/CommonLibSF/CMakePresets.json +++ b/CommonLibSF/CMakePresets.json @@ -138,7 +138,7 @@ ] }, { - "name": "build-debug-clang-cl", + "name": "build-debug-clang-cl-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -168,7 +168,7 @@ ] }, { - "name": "build-release-clang-cl", + "name": "build-release-clang-cl-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -201,12 +201,12 @@ }, { "name": "debug-clang-cl", - "configurePreset": "build-debug-clang-cl", + "configurePreset": "build-debug-clang-cl-ninja", "displayName": "5. (Debug) Clang - Ninja" }, { "name": "release-clang-cl", - "configurePreset": "build-release-clang-cl", + "configurePreset": "build-release-clang-cl-ninja", "displayName": "6. (Release) Clang - Ninja" } ]