From 7994a34e6ad476e625453170b6016746837d69b6 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Sat, 15 Jun 2024 20:19:58 -0500 Subject: [PATCH] .github/workflows/windows.yml - fix use of vcpkg,json The vcpkg.json file must exist before `vcpkg install` is run --- .github/workflows/windows.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f94d2fc6740a84..1d7d299f77cf66 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -113,10 +113,6 @@ jobs: ${{ runner.os }}-vcpkg-installed-${{ env.OS_VER }}- ${{ runner.os }}-vcpkg-installed- - - name: Install libraries with vcpkg - run: | - vcpkg --triplet x64-windows install gmp libffi libyaml openssl zlib - - name: Install libraries with scoop run: | iex "& {$(irm get.scoop.sh)} -RunAsAdmin" @@ -128,6 +124,17 @@ jobs: sparse-checkout-cone-mode: false sparse-checkout: /.github + - name: Install libraries with vcpkg + # override global setting of 'build', vcpkg.json is in root + working-directory: . + run: | + vcpkg --triplet x64-windows install gmp libffi libyaml openssl zlib + vcpkg --triplet x64-windows upgrade gmp libffi libyaml openssl zlib --no-dry-run + + - name: List vcpkg libraries + working-directory: . + run: vcpkg list + - uses: ./.github/actions/setup/directories with: srcdir: src