From ae53f0c29634454419e6170e31e3cfdb6541053c Mon Sep 17 00:00:00 2001 From: Julius Pfrommer Date: Sun, 24 Dec 2023 01:49:50 +0100 Subject: [PATCH] refactor(ci): Pin vcpkg triplet to vc142 (VS2019) --- tools/azure-devops/win/build.ps1 | 2 +- tools/azure-devops/win/install.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1 index e05cddd5a68..1ee85355e67 100644 --- a/tools/azure-devops/win/build.ps1 +++ b/tools/azure-devops/win/build.ps1 @@ -29,7 +29,7 @@ if ($env:CC_SHORTNAME -eq "mingw") { clang --version } else { $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"' - $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"' + $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows-vc142"' } $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`"" diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1 index 0adb8347d31..726eb67a8b3 100644 --- a/tools/azure-devops/win/install.ps1 +++ b/tools/azure-devops/win/install.ps1 @@ -26,14 +26,14 @@ if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") { } } else { Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n" - & vcpkg install mbedtls:x64-windows + & vcpkg install mbedtls:x64-windows-vc142 if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) { Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***" exit $LASTEXITCODE } Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n" - & vcpkg install check:x64-windows + & vcpkg install check:x64-windows-vc142 if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) { Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***" exit $LASTEXITCODE