From 80eae8fe741d941b5d5b0053cbb10549553c1918 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 30 Jul 2024 15:49:33 +0200
Subject: [PATCH] Bump vcpkg version

The old version doesn't support MSVC 17.10 toolchain, so we cannot
build for arm64.

Change-Id: I63df5b61d6d7e06ee49f46f77528021f3ce5be47
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 coin/provisioning/common/linux/install-vcpkg.sh           | 2 +-
 coin/provisioning/common/shared/vcpkg_registry_mirror.txt | 1 +
 .../provisioning/common/shared/vcpkg_tool_release_tag.txt | 2 +-
 coin/provisioning/common/shared/vcpkg_version.txt         | 2 +-
 coin/provisioning/common/windows/install-vcpkg.ps1        | 8 ++++++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/coin/provisioning/common/linux/install-vcpkg.sh b/coin/provisioning/common/linux/install-vcpkg.sh
index 80917beb..b7d5c63f 100755
--- a/coin/provisioning/common/linux/install-vcpkg.sh
+++ b/coin/provisioning/common/linux/install-vcpkg.sh
@@ -23,7 +23,7 @@ nonDottedReleaseTag=${vcpkgVersion//-/}
 
 vcpkgToolOfficialUrl="https://github.com/microsoft/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolCacheUrl="http://ci-files01-hki.ci.qt.io/input/vcpkg/vcpkg-tool-$nonDottedReleaseTag.tar.gz"
-vcpkgToolSHA1="c6029714fca0304779f10c9c1cbe4b061a2fd945"
+vcpkgToolSHA1="99a31b0bed2845f5c915735121d34c453126ec76"
 vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
 vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"
 
diff --git a/coin/provisioning/common/shared/vcpkg_registry_mirror.txt b/coin/provisioning/common/shared/vcpkg_registry_mirror.txt
index 546ef5b6..ad7e5252 100644
--- a/coin/provisioning/common/shared/vcpkg_registry_mirror.txt
+++ b/coin/provisioning/common/shared/vcpkg_registry_mirror.txt
@@ -1 +1,2 @@
+https://git.qt.io/aledelev/vcpkg.git
 https://git.qt.io/mrmsdbdl/vcpkg-mirror.git
diff --git a/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt b/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
index 3faa2683..f0099f2b 100644
--- a/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
+++ b/coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
@@ -1 +1 @@
-vcpkg_tool_release_tag=2023-11-16
+vcpkg_tool_release_tag=2024-09-18
diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt
index d2aa3aa3..e6f0b849 100644
--- a/coin/provisioning/common/shared/vcpkg_version.txt
+++ b/coin/provisioning/common/shared/vcpkg_version.txt
@@ -1 +1 @@
-vcpkg_version=2023.10.19
+vcpkg_version=2024.08.23
diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1
index ee42557d..29079f11 100644
--- a/coin/provisioning/common/windows/install-vcpkg.ps1
+++ b/coin/provisioning/common/windows/install-vcpkg.ps1
@@ -34,9 +34,9 @@ if($arch -eq "x64") {
 }
 
 if($arch -eq "x64") {
-    $vcpkgExeSHA1 = "F74DCDE7F6F5082EF6DC31FED486FAD69BE8D442"
+    $vcpkgExeSHA1 = "484373186A905E9F39FE385F4FB59F263B9FFE95"
 } elseif($arch -eq "arm64") {
-    $vcpkgExeSHA1 = "75049DC9A6FB813EFB7B48B2140DE067E73E977C"
+    $vcpkgExeSHA1 = "E0C4CBCD64B867CE386886806D8CA9C84610545F"
 }
 
 $vcpkgExeOfficialUrl = "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgExeReleaseTag/vcpkg$suffix.exe"
@@ -55,6 +55,10 @@ if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){
 # Disable telemetry
 Set-Content -Value "" -Path "$vcpkgRoot\vcpkg.disable-metrics" -Force
 
+# Bootstrap vcpkg
+Set-Location -Path "$vcpkgRoot"
+cmd.exe /c "$vcpkgRoot\bootstrap-vcpkg.bat"
+
 # Setting VCPKG_ROOT using Set-EnvironmentVariable makes the variable only
 # available during build time. In order to make it available during the
 # provisioning, we need to directly set it via $env:VCPKG_ROOT as well.