diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-05-27 18:40:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 18:40:23 -0700 |
| commit | d9b4acf02d8c784927f89d23edb677408ec428af (patch) | |
| tree | 305431cf6dcf02cf92ddf83ff3b071e4e49496d6 /scripts | |
| parent | 1982faa57b2206fd91e65a9976a67cd294f4918f (diff) | |
| download | vcpkg-d9b4acf02d8c784927f89d23edb677408ec428af.tar.gz vcpkg-d9b4acf02d8c784927f89d23edb677408ec428af.zip | |
[vcpkg] Move CI cleaning back out of the 'ci' command into a separate command to restore cross-compilation preinstalls. (#11545)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/azure-pipelines/linux/azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | scripts/azure-pipelines/osx/azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | scripts/azure-pipelines/windows/azure-pipelines.yml | 7 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 8 |
4 files changed, 9 insertions, 8 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index c51515148..022fc70e4 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -35,6 +35,7 @@ jobs: - bash: toolsrc/build.rel/vcpkg-test
displayName: 'Run vcpkg tests'
- powershell: |
+ ./vcpkg x-ci-clean
$skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "x64-linux" -BaselineFile "$(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt"
mkdir $(System.ArtifactsDirectory)/xml-results
$env:HOME = '/home/agent'
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index b06bffb6f..e51698c45 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -36,6 +36,7 @@ jobs: - bash: toolsrc/build.rel/vcpkg-test
displayName: 'Run vcpkg tests'
- powershell: |
+ ./vcpkg x-ci-clean
$skip_list = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "x64-osx" -BaselineFile "$(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt"
mkdir $(System.ArtifactsDirectory)/xml-results
./vcpkg ci x64-osx --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-osx.xml" --exclude=$skip_list --binarycaching
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 327f9511a..48f3908d2 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,8 +20,15 @@ jobs: inputs:
filename: 'bootstrap-vcpkg.bat'
- powershell: |
+ .\vcpkg.exe x-ci-clean
$skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "${{ parameters.triplet }}" -BaselineFile "$(System.DefaultWorkingDirectory)\scripts\ci.baseline.txt"
mkdir $(System.ArtifactsDirectory)\xml-results
+ # 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 ( "${{ parameters.triplet }}" -notmatch "x86-windows" -and "${{ parameters.triplet }}" -notmatch "x64-windows" ) {
+ .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows
+ }
+
$command = ".\vcpkg.exe ci ${{ parameters.triplet }} --x-xunit=`"$(System.ArtifactsDirectory)\xml-results\${{ parameters.triplet }}.xml`" --exclude=$skipList --binarycaching"
Set-Content -Path 'run_ci.cmd' -Value $command -Encoding ASCII
displayName: 'Write Test Modified Ports Batch File'
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08203a2d8..3858c8587 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -166,14 +166,6 @@ boost-test:arm-uwp=fail boost-test:x64-uwp=fail
boost-wave:arm-uwp=fail
boost-wave:x64-uwp=fail
-# Building boost-* with arm-uwp requires the x86-windows boost-* which breaks CI testing, Ignore them
-boost-atomic:arm-uwp=ignore
-boost-signals:arm-uwp=ignore
-boost-exception:arm-uwp=ignore
-boost-regex:arm-uwp=ignore
-boost-nowide:arm-uwp=ignore
-boost-system:arm-uwp=ignore
-boost-container:arm-uwp=ignore
botan:arm64-windows=fail
botan:arm-uwp=fail
botan:x64-uwp=fail
|