diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 08:16:37 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-30 08:16:37 -0800 |
| commit | 1e8bb55f144a61c68e01cefe1b3c15f58b71cd06 (patch) | |
| tree | ca64cf2d7d0a1847565f9c925f51a60f45b9fd81 /scripts | |
| parent | 9c78c77f473340f4c49f0fa77b54365d0e99efd7 (diff) | |
| parent | d38d4a75408e0e9d0820187b16da2e06ce0ee316 (diff) | |
| download | vcpkg-1e8bb55f144a61c68e01cefe1b3c15f58b71cd06.tar.gz vcpkg-1e8bb55f144a61c68e01cefe1b3c15f58b71cd06.zip | |
Merge branch 'xunit'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/internalCI.ps1 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/scripts/internalCI.ps1 b/scripts/internalCI.ps1 index 16ce4fc7a..37f4f35a4 100644 --- a/scripts/internalCI.ps1 +++ b/scripts/internalCI.ps1 @@ -1,5 +1,7 @@ $ErrorActionPreference = "Stop" +rm TEST-internal-ci.xml -errorAction SilentlyContinue + New-Item -type directory downloads -errorAction SilentlyContinue | Out-Null ./scripts/bootstrap.ps1 if (-not $?) { throw $? } @@ -7,21 +9,14 @@ if (-not $?) { throw $? } # Clear out any intermediate files from the previous build if (Test-Path buildtrees) { - Get-ChildItem buildtrees/*/* | ? { $_.Name -ne "src" -and $_.Extension -ne ".log"} | Remove-Item -Recurse -Force + Get-ChildItem buildtrees/*/* | ? { $_.Name -ne "src" } | Remove-Item -Recurse -Force } # Purge any outdated packages ./vcpkg remove --outdated --recurse if (-not $?) { throw $? } -./vcpkg.exe install azure-storage-cpp cpprestsdk:x64-windows-static cpprestsdk:x86-uwp -if (-not $?) { throw $? } - -./vcpkg.exe install bond cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static +./vcpkg.exe install azure-storage-cpp cpprestsdk:x64-windows-static cpprestsdk:x86-uwp ` +bond cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static ` +opencv:x86-uwp boost:x86-uwp --keep-going "--x-xunit=TEST-internal-ci.xml" if (-not $?) { throw $? } - -./vcpkg.exe install opencv:x86-uwp boost:x86-uwp -if (-not $?) { throw $? } - -# ./vcpkg.exe install folly:x64-windows -# if (-not $?) { throw $? } |