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/windows | |
| 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/windows')
| -rw-r--r-- | scripts/azure-pipelines/windows/azure-pipelines.yml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index f2b14657b..24089b674 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -23,17 +23,25 @@ jobs: set VCPKG_DOWNLOADS=D:\downloads
.\bootstrap-vcpkg.bat
- powershell: |
- .\vcpkg.exe x-ci-clean --binarycaching --x-binarysource=clear`;files`,W:\`,upload --x-buildtrees-root=E:\buildtrees --x-install-root=E:\install --x-packages-root=E:\packages --downloads-root=D:\downloads
+ $env:VCPKG_DOWNLOADS='D:\downloads'
+ $commonArgs = @(
+ '--binarycaching',
+ '--x-binarysource=clear;files,W:\,upload',
+ '--x-buildtrees-root=E:\buildtrees',
+ '--x-install-root=E:\install',
+ '--x-packages-root=E:\packages'
+ )
+
+ .\vcpkg.exe x-ci-clean @commonArgs
$skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "${{ parameters.triplet }}" -BaselineFile .\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 --binarycaching --x-binarysource=clear`;files`,W:\`,upload --x-buildtrees-root=E:\buildtrees --x-install-root=E:\install --x-packages-root=E:\packages --downloads-root=D:\downloads
+ .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows @commonArgs
}
- .\vcpkg.exe ci ${{ parameters.triplet }} --x-xunit=`"$(System.ArtifactsDirectory)\xml-results\${{ parameters.triplet }}.xml`" --exclude=$skipList --binarycaching --x-binarysource=clear`;files`,W:\`,upload --x-buildtrees-root=E:\buildtrees --x-install-root=E:\install --x-packages-root=E:\packages --downloads-root=D:\downloads
- Set-Content -Path 'run_ci.cmd' -Value $command -Encoding ASCII
+ .\vcpkg.exe ci ${{ parameters.triplet }} --x-xunit=`"$(System.ArtifactsDirectory)\xml-results\${{ parameters.triplet }}.xml`" --exclude=$skipList @commonArgs
displayName: '** Test Modified Ports **'
- task: PowerShell@2
displayName: 'Analyze results and prepare test logs'
|