summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <shibata.hiroshi@gmail.com>2026-07-30 16:40:33 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2026-07-30 19:06:09 -0700
commit8f372fcb519e8d56e2d50d80ad9e47bb11f74d09 (patch)
tree2045951ff2db7729980c91706d8a29e6327a26a0
parent37fc35aceee74ba0cebf55578cc7c4adabd5599d (diff)
Re-bootstrap vcpkg after updating its registryruby_4_0
microsoft/vcpkg bumped `scripts/vcpkg-tools.json` to schema version 2, which the vcpkg.exe bundled in the runner images cannot parse, so every Windows job started failing at `vcpkg install` right after the `git pull`. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> (cherry picked from commit f275e95ff23f1a299b2a72fc47758de539db8dde)
-rw-r--r--.github/workflows/tarball-windows.yml4
-rw-r--r--.github/workflows/windows.yml4
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