From 3b6f48fbf86de13a921b92f2e0db9ddb40309a15 Mon Sep 17 00:00:00 2001 From: David Boucher Date: Tue, 27 Aug 2024 11:13:26 +0200 Subject: [PATCH] fix(collect/cmake): collect did not compile correctly with the new vcpkg (#1645) REFS: MON-147095 --- .github/scripts/windows-agent-compile.ps1 | 4 ++-- cmake-vcpkg.sh | 2 +- vcpkg.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/windows-agent-compile.ps1 b/.github/scripts/windows-agent-compile.ps1 index bd44fb3bf50..02af28abb7e 100644 --- a/.github/scripts/windows-agent-compile.ps1 +++ b/.github/scripts/windows-agent-compile.ps1 @@ -53,10 +53,10 @@ if ( $? -ne $true ) { [System.Environment]::SetEnvironmentVariable("VCPKG_ROOT",$pwd.ToString()+"\vcpkg") [System.Environment]::SetEnvironmentVariable("PATH",$pwd.ToString()+"\vcpkg;" + $env:PATH) - + Write-Host "compile vcpkg dependencies" vcpkg install --vcpkg-root $env:VCPKG_ROOT --x-install-root build_windows\vcpkg_installed --x-manifest-root . --overlay-triplets custom-triplets --triplet x64-windows - + Write-Host "Compress binary archive" 7z a $file_name_extension build_windows\vcpkg_installed Write-Host "Upload binary archive" diff --git a/cmake-vcpkg.sh b/cmake-vcpkg.sh index ed652b7922a..e8eb514dcdb 100755 --- a/cmake-vcpkg.sh +++ b/cmake-vcpkg.sh @@ -258,7 +258,7 @@ fi if [ ! -d vcpkg ] ; then echo "No vcpkg directory. Cloning the repo" - git clone --depth 1 --single-branch --no-tags https://github.com/Microsoft/vcpkg.git + git clone --depth 1 -b 2024.01.12 https://github.com/Microsoft/vcpkg.git ./vcpkg/bootstrap-vcpkg.sh fi diff --git a/vcpkg.json b/vcpkg.json index 408c71efe59..4b7d7928448 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -60,4 +60,4 @@ "platform": "linux" } ] -} \ No newline at end of file +}