diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-05-27 04:55:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 13:55:22 -0700 |
| commit | 117cf538f40860f6a1ba89c9c9c151f03ab35ddf (patch) | |
| tree | f917318fecc352e0418d0ea151b1505d9392b4a5 /scripts | |
| parent | fbbadfc1ceed739f7d41512a0f52e91cdc15ca7a (diff) | |
| download | vcpkg-117cf538f40860f6a1ba89c9c9c151f03ab35ddf.tar.gz vcpkg-117cf538f40860f6a1ba89c9c9c151f03ab35ddf.zip | |
[vcpkg] Remove workaround in Ci pipeline (#18119)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 34533aef7..11d98e5ce 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -136,12 +136,6 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" `
-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'))
{
# WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list.
|
