mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-18 21:57:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Remove workaround in Ci pipeline (#18119)

Browse Source
This commit is contained in:
Phoebe 2021-05-27 04:55:22 +08:00 committed by GitHub
parent fbbadfc1ce
commit 117cf538f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/azure-pipelines/test-modified-ports.ps1
View File

@ -136,12 +136,6 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" `
-BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" `
-SkipFailures:$skipFailures -SkipFailures:$skipFailures
# WORKAROUND: the x86-windows flavors of these are needed for all cross-compilation, but they are not auto-installed.
# Install them so the CI succeeds:
if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp', 'x64-windows', 'x64-windows-static', 'x64-windows-static-md')) {
.\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux'))
{ {
# WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list.