Suppress output of git pull; remove vcpkg from cache

This commit is contained in:
Roelf-Jilling 2018-11-16 17:57:50 +01:00
parent a7ec3a85ab
commit eb936dab34

View File

@ -32,7 +32,6 @@ matrix:
cache: cache:
- C:\cmake-3.8.0-win32-x86 - C:\cmake-3.8.0-win32-x86
- C:\Tools\vcpkg
install: install:
- ps: | - ps: |
@ -43,15 +42,16 @@ install:
} }
$env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH" $env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH"
} }
# Until vcpkg has been updated. # Workaround for lld bug with vcpkg integration
# Note: vcpkg can also be removed from "cache".
if ($env:USE_TOOLSET -eq "LLVM" -and if ($env:USE_TOOLSET -eq "LLVM" -and
(Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020 (Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020
) { ) {
echo "Updating vcpkg..."
cd C:\Tools\vcpkg cd C:\Tools\vcpkg
git pull git pull > $NULL
cd "$env:APPVEYOR_BUILD_FOLDER" cd "$env:APPVEYOR_BUILD_FOLDER"
} } else { echo "==> vcpkg has been updated, please remove the workaround from appvayor.yml." }
# /Workaround
before_build: before_build:
- ps: | - ps: |