Skip to content

Commit 07e16a0

Browse files
authored
Temp fix for vcpkg bug (#11)
1 parent 4d22626 commit 07e16a0

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

.github/workflows/mswin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
$env:VCPKG_ROOT = $env:VCPKG_INSTALLATION_ROOT
3434
cd $env:VCPKG_INSTALLATION_ROOT
3535
git pull -q
36+
C:/msys64/usr/bin/patch.exe -p1 -N --no-backup-if-mismatch -i $env:GITHUB_WORKSPACE/bootstrap-06-22.patch
3637
./bootstrap-vcpkg.bat
3738
echo "`n———————————— ./vcpkg list ————————————"
3839
./vcpkg list

bootstrap-06-22.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
2+
index 04d4a5c5b..cdd7979f9 100644
3+
--- a/scripts/bootstrap.ps1
4+
+++ b/scripts/bootstrap.ps1
5+
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
6+
7+
Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
8+
9+
-$versionDate = '2023-06-15'
10+
+$versionDate = '2023-06-22'
11+
if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") {
12+
& "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
13+
} else {

0 commit comments

Comments
 (0)