From ed3c5e4fcadaaae13c8dbfbf8edf74d6b9e71220 Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Wed, 14 Dec 2022 03:10:24 +0100 Subject: [PATCH] Update cmake.yml remove github action and try to roll our own for vpkg bootstrapping --- .github/workflows/cmake.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0f1e169..1b3d7b4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,6 +21,12 @@ jobs: matrix: os: [windows-latest, ubuntu-latest] BUILD_TYPE: [Debug, Release] + BOOTSTRAP_EXT: [bat, sh] + exclude: + - os: windows-latest + - BOOTSTRAP_EXT: sh + - os: ubuntu-latest + - BOOTSTRAP_EXT: bat steps: - name: checkout @@ -28,8 +34,8 @@ jobs: with: submodules: true - - name: run-vcpkg - uses: lukka/run-vcpkg@v10.7 + - name: bootstrap-vcpkg + run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.${{BOOTSTRAP_EXT}} - 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.