diff options
| -rw-r--r-- | .github/workflows/tarball-windows.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/tarball-windows.yml b/.github/workflows/tarball-windows.yml index aaa65e0da5..68b608cca0 100644 --- a/.github/workflows/tarball-windows.yml +++ b/.github/workflows/tarball-windows.yml @@ -90,8 +90,12 @@ jobs: "VCPKG_BINARY_SOURCES=clear;nuget,$Env:FEED_URL,$Env:FEED_MODE" >> $Env:GITHUB_ENV - name: Install libraries with vcpkg + # The registry pinned by `builtin-baseline` can need a newer tool + # than the vcpkg.exe shipped in the runner image, so re-bootstrap + # it to the version the pulled registry asks for. run: | git -C "%VCPKG_INSTALLATION_ROOT%" pull --quiet + call "%VCPKG_INSTALLATION_ROOT%\bootstrap-vcpkg.bat" vcpkg install working-directory: ${{ inputs.archname }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 734ea49e6d..a52a61c05d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -108,8 +108,12 @@ jobs: "VCPKG_BINARY_SOURCES=clear;nuget,$Env:FEED_URL,$Env:FEED_MODE" >> $Env:GITHUB_ENV - name: Install libraries with vcpkg + # The registry pinned by `builtin-baseline` can need a newer tool + # than the vcpkg.exe shipped in the runner image, so re-bootstrap + # it to the version the pulled registry asks for. run: | git -C "%VCPKG_INSTALLATION_ROOT%" pull --quiet + call "%VCPKG_INSTALLATION_ROOT%\bootstrap-vcpkg.bat" vcpkg install working-directory: src |