From 97a801e4a69e2091a5d5aa59197cd6ad1ff8a95c Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Wed, 14 Dec 2022 03:19:07 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 51a9ea3..7079aff 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,12 +21,11 @@ jobs: matrix: os: [windows-latest, ubuntu-latest] BUILD_TYPE: [Debug, Release] - BOOTSTRAP_EXT: [bat, sh] - exclude: + include: - os: windows-latest - - BOOTSTRAP_EXT: sh + - BOOTSTRAP: bootstrap-vcpkg.bat - os: ubuntu-latest - - BOOTSTRAP_EXT: bat + - BOOTSTRAP: bootstrap-vcpkg.sh steps: - name: checkout @@ -35,7 +34,7 @@ jobs: submodules: true - name: bootstrap-vcpkg - run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.${{matrix.BOOTSTRAP_EXT}} + run: ${{github.workspace}}/external/vcpkg/${{matrix.BOOTSTRAP}} - 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.