diff options
| author | ankurverma85 <31362771+ankurverma85@users.noreply.github.com> | 2021-01-08 11:55:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:55:31 -0800 |
| commit | aa83f4bd2a0ba162fcc104afe3c6afbb9b0812e7 (patch) | |
| tree | 0cf0af12c0e514b59760751ec72172ab2bdb6486 /scripts/azure-pipelines | |
| parent | ddeef79a7df0365ac8fcfeca3821bc61d7ff76f2 (diff) | |
| download | vcpkg-aa83f4bd2a0ba162fcc104afe3c6afbb9b0812e7.tar.gz vcpkg-aa83f4bd2a0ba162fcc104afe3c6afbb9b0812e7.zip | |
[vcpkg] Add x64-windows-static-md to pipeline (#15411)
* Add x64-windows-static-md to pipeline
* Update azure-pipelines.yml
* Update test-modified-ports.ps1
* Replicate skip/fail from x64-windows-static
* Add failures to ci.baseline
* Update ci.baseline.txt
* Update ci.baseline.txt
* Update ci.baseline.txt
* Update ci.baseline.txt
Co-authored-by: ankurv <ankurv@microsoft.com>
Diffstat (limited to 'scripts/azure-pipelines')
| -rw-r--r-- | scripts/azure-pipelines/azure-pipelines.yml | 6 | ||||
| -rwxr-xr-x | scripts/azure-pipelines/test-modified-ports.ps1 | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 762c161ec..7fce6a5c1 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -72,6 +72,12 @@ stages: - template: windows/azure-pipelines.yml
parameters:
+ triplet: x64-windows-static-md
+ jobName: x64_windows_static_md
+ poolName: $(windows-pool)
+
+ - template: windows/azure-pipelines.yml
+ parameters:
triplet: x64-uwp
jobName: x64_uwp
poolName: $(windows-pool)
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 546545579..9ca814cca 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -50,7 +50,7 @@ Param( $BuildReason = $null
)
-if (-Not (Test-Path "triplets/$Triplet.cmake")) {
+if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) {
Write-Error "Incorrect triplet '$Triplet', please supply a valid triplet."
throw
}
@@ -140,7 +140,7 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` # Install them so the CI succeeds:
if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) {
.\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows ampl-mp:x86-windows @commonArgs
-} elseif ($Triplet -in @('x64-windows', 'x64-windows-static')) {
+} elseif ($Triplet -in @('x64-windows', 'x64-windows-static', 'x64-windows-static-md')) {
.\vcpkg.exe install yasm-tool:x86-windows @commonArgs
}
|