diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c193b3c..02782b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,8 @@ jobs: strategy: matrix: configuration: - - Debug - - Release + - debug + - release steps: - name: Check out files uses: actions/checkout@v2 @@ -34,30 +34,28 @@ jobs: - name: Setup CMake uses: lukka/get-cmake@latest - - name: Set up problem matching + - name: Setup problem matching uses: ammaraskar/msvc-problem-matcher@master - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 - with: - msbuild-architecture: x64 - - name: Setup DevCmd uses: ilammy/msvc-dev-cmd@v1.10.0 with: arch: x64 + - name: Setup Ninja + uses: ashutoshvarma/setup-ninja@master + - name: Configure CMake - run: cmake --preset=vs2022 + run: cmake --preset=${{matrix.configuration}} - name: Build ${{matrix.configuration}} - run: cmake --build --preset=vs2022 --config ${{matrix.configuration}} + run: cmake --build --preset=${{matrix.configuration}} - name: Upload ${{matrix.configuration}} binaries uses: actions/upload-artifact@v2 with: name: ${{matrix.configuration}} binaries path: | - build/vs2022/artifacts-${{matrix.configuration}}/*.exe - build/vs2022/artifacts-${{matrix.configuration}}/*.pdb - build/vs2022/artifacts-${{matrix.configuration}}/*.sys \ No newline at end of file + build/${{matrix.configuration}}/artifacts/*.exe + build/${{matrix.configuration}}/artifacts/*.pdb + build/${{matrix.configuration}}/artifacts/*.sys \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json index dd8ced4..906bf34 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -47,14 +47,6 @@ { "name": "debug", "configurePreset": "debug" - }, - { - "name": "vs2019", - "configurePreset": "vs2019" - }, - { - "name": "vs2022", - "configurePreset": "vs2022" } ] } \ No newline at end of file