diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-06-08 22:46:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 22:46:18 -0700 |
| commit | 1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb (patch) | |
| tree | 78da83892364778a2344ec7bae1bb565add289d9 /scripts/azure-pipelines/linux | |
| parent | cb8a9fe7157f8ad2423742f893955ed9ced05910 (diff) | |
| download | vcpkg-1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb.tar.gz vcpkg-1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb.zip | |
[vcpkg] Fix OSX CI by ensuring the downloads directory exists (#11839)
* [vcpkg] Remove do-nothing Set-Content from Windows azure-pipelines.yml.
* [vcpkg] Fix OSX CI by ensuring the downloads directory exists in advance, and extract common command line parameters with powershell splatting.
* [tensorflow-cc] Prevent hang building tensorflow-cc asking to configure iOS.
* Skip ignition-msgs5:x64-osx
Diffstat (limited to 'scripts/azure-pipelines/linux')
| -rw-r--r-- | scripts/azure-pipelines/linux/azure-pipelines.yml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 83a634919..1e2a653e0 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -33,11 +33,20 @@ jobs: - bash: toolsrc/build.rel/vcpkg-test
displayName: 'Run vcpkg tests'
- powershell: |
- ./vcpkg x-ci-clean --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching --x-binarysource=clear`;files`,/archives`,upload --x-buildtrees-root=/mnt/vcpkg-ci/buildtrees --x-install-root=/mnt/vcpkg-ci/install --x-packages-root=/mnt/vcpkg-ci/packages
+ $env:VCPKG_DOWNLOADS = '/mnt/vcpkg-ci/downloads'
+ $commonArgs = @(
+ '--binarycaching',
+ '--x-binarysource=clear;files,/archives,upload',
+ '--x-buildtrees-root=/mnt/vcpkg-ci/buildtrees',
+ '--x-install-root=/mnt/vcpkg-ci/install',
+ '--x-packages-root=/mnt/vcpkg-ci/packages'
+ )
+
+ ./vcpkg x-ci-clean @commonArgs
$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'
- ./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching --x-binarysource=clear`;files`,/archives`,upload --x-buildtrees-root=/mnt/vcpkg-ci/buildtrees --x-install-root=/mnt/vcpkg-ci/install --x-packages-root=/mnt/vcpkg-ci/packages --downloads-root=/mnt/vcpkg-ci/downloads
+ ./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList @commonArgs
displayName: '** Test Modified Ports **'
- task: PowerShell@2
displayName: 'Analyze results and prepare test logs'
|