diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2021-05-06 07:12:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 07:12:43 -0700 |
| commit | 4e83da08875f8d0f051101d2a42e1171b4001b38 (patch) | |
| tree | aabe1af4d644e9a05b7004f3dea385542b9d4a6a /scripts/azure-pipelines | |
| parent | 4ef97c2c33275d7b763e3f5b3308f4bead0a0b08 (diff) | |
| download | vcpkg-4e83da08875f8d0f051101d2a42e1171b4001b38.tar.gz vcpkg-4e83da08875f8d0f051101d2a42e1171b4001b38.zip | |
[vcpkg] Update vcpkg tool version 2021-05-05 (#17689)
* [vcpkg] Update vcpkg tool version 2021-05-05
* [vcpkg] Hotfix bug in Microsoft/vcpkg-tool#34
* [vcpkg-ci] Ignore results from non-target triplets
* [protobuf] Fix regression introduced in #16904
* [vcpkg] Fix bug where 'staticcrt' was ignored
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
Diffstat (limited to 'scripts/azure-pipelines')
| -rwxr-xr-x | scripts/azure-pipelines/analyze-test-results.ps1 | 4 | ||||
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1 index 5bebe985c..d96069abe 100755 --- a/scripts/azure-pipelines/analyze-test-results.ps1 +++ b/scripts/azure-pipelines/analyze-test-results.ps1 @@ -100,6 +100,10 @@ function build_test_results { $allTestResults = @{ } foreach ( $test in $xmlCollection.test) { + if (!$test.name.endswith(":$triplet")) + { + continue + } $name = ($test.name -replace ":.*$") # Reconstruct the original BuildResult enumeration (defined in Build.h) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index fa80a1a10..34533aef7 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -142,7 +142,16 @@ if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp', 'x64-windows', 'x64-wi .\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
-& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @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.
+ # The workaround is to pass the skip list as host-excludes as well.
+ & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs
+}
+else
+{
+ & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs
+}
& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults `
-triplet $Triplet `
-baselineFile .\scripts\ci.baseline.txt
|