From 68bfe94690265bcfa7910d356703d634808be69b Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:55:33 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e387cc0..2e1c0e1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -24,10 +24,10 @@ jobs: include: - os: 'windows-latest' triplet: x64-windows - shell_ext: bat + vcpkg_bootstrap: bootstrap-vcpkg.bat - os: 'ubuntu-latest' triplet: x64-linux - shell_ext: sh + vcpkg_bootstrap: bootstrap-vcpkg.sh steps: - name: checkout @@ -35,14 +35,8 @@ jobs: with: submodules: true - #- if: runner.os == 'Windows' - # name: Boostrap Vcpkg - # run: ${{github.workspace}}\external\vcpkg\bootstrap-vcpkg.bat -disableMetrics - - #- if: runner.os != 'Windows' - name: Boostrap Vcpkg - #run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.sh -disableMetrics - run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.${{matrix.shell_ext}} -disableMetrics + run: ${{github.workspace}}/external/vcpkg/${{matrix.vcpkg_bootstrap}} -disableMetrics - name: Install packaged dependencies run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet ${{matrix.triplet}}