From 1b8dabf69a30b3da47068780b8cfc9616bf7a1c5 Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Sat, 17 Dec 2022 00:04:22 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 807434f..7168158 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,14 +20,6 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - build_configuration: [Debug, Release] - include: - - os: windows-latest - - bootstrap: bootstrap-vcpkg.bat - - triplet: x64-windows - - os: ubuntu-latest - - bootstrap: bootstrap-vcpkg.sh - - triplet: x64-linux steps: - name: checkout @@ -35,11 +27,21 @@ jobs: with: submodules: true - - name: Boostrap Vcpkg - run: ${{github.workspace}}/external/vcpkg/${{matrix.bootstrap}} -disableMetrics + - if: runner.os == 'Windows' + name: Boostrap Vcpkg + run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.bat -disableMetrics - - name: Install packaged dependencies - run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet ${{matrix.triplet}} + - if: runner.os != 'Windows' + name: Boostrap Vcpkg + run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.sh -disableMetrics + + - if: runner.os == 'Windows' + name: Install packaged dependencies + run: ${{github.workspace}}\external\vcpkg\vcpkg.exe install spdlog --triplet x64-windows + + - if: runner.os != 'Windows' + name: Install packaged dependencies + run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet x64-linux - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.