From 82b81046acfd58089419294f37489c5c32dc268e Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Sat, 17 Dec 2022 00:09:11 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7168158..f9b851b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,6 +20,16 @@ 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 + - vcpkg: vcpkg.exe + - os: ubuntu-latest + - bootstrap: bootstrap-vcpkg.sh + - triplet: x64-linux + - vcpkg: vcpkg steps: - name: checkout @@ -27,21 +37,11 @@ jobs: with: submodules: true - - if: runner.os == 'Windows' - name: Boostrap Vcpkg - run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.bat -disableMetrics + - 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.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: Install packaged dependencies + run: ${{github.workspace}}/external/vcpkg/${{matrix.vcpkg}} install spdlog --triplet ${{matrix.triplet}} - 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.