From 3f621743cc0bd7088d7ef7456a31f2f51e920652 Mon Sep 17 00:00:00 2001 From: Andrew Krieger Date: Mon, 20 Nov 2023 13:06:55 -0800 Subject: [PATCH] Update vcpkg commit to working hash. Packages were deprecated that core vcpkg functionality relied on. Update vcpkg to a commit where they handle that. --- .github/workflows/msvc-full-features.yml | 2 +- .github/workflows/release.yml | 2 +- doc/COMPILING/COMPILING-VS-VCPKG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml index cb7bca7899bd7..6a5f3e229828c 100644 --- a/.github/workflows/msvc-full-features.yml +++ b/.github/workflows/msvc-full-features.yml @@ -76,7 +76,7 @@ jobs: id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c' + vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877' - name: Integrate vcpkg run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 122057751719f..fa0c936234b73 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -180,7 +180,7 @@ jobs: id: runvcpkg with: vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg' - vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c' + vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877' - name: Install dependencies (windows msvc) (3/3) if: runner.os == 'Windows' run: | diff --git a/doc/COMPILING/COMPILING-VS-VCPKG.md b/doc/COMPILING/COMPILING-VS-VCPKG.md index 25613343d84c3..a5392e06715e9 100644 --- a/doc/COMPILING/COMPILING-VS-VCPKG.md +++ b/doc/COMPILING/COMPILING-VS-VCPKG.md @@ -22,7 +22,7 @@ Steps from current guide were tested on Windows 10 (64 bit), Visual Studio 2019 2. Install `Git for Windows` (installer can be downloaded from [Git homepage](https://git-scm.com/)). -3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `5b1214315250939257ef5d62ecdcbca18cf4fb1c` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described: +3. Install and configure `vcpkg`. If you already have `vcpkg` installed, you should update it to at least commit `66444e13a86da7087ee24c342f91801cc6eb9877` (the most recent tested good revision) and rerun `.\bootstrap-vcpkg.bat` as described: ***WARNING: It is important that, wherever you decide to clone this repo, the path does not include whitespace. That is, `C:/dev/vcpkg` is acceptable, but `C:/dev test/vcpkg` is not.***