Skip to content

Commit

Permalink
refactor(ci): Pin vcpkg triplet to vc142 (VS2019)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpfr committed Dec 24, 2023
1 parent fe69e72 commit ae53f0c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tools/azure-devops/win/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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`""
Expand Down
4 changes: 2 additions & 2 deletions tools/azure-devops/win/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae53f0c

Please sign in to comment.