para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Suppress output of git pull; remove vcpkg from cache

Browse Source
This commit is contained in:
Roelf-Jilling 2018-11-16 17:57:50 +01:00
parent a7ec3a85ab
commit eb936dab34
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
appveyor.yml
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: |
@ -68,7 +68,7 @@ before_build:
echo generator="$env:generator" echo generator="$env:generator"
if ($env:USE_TOOLSET -eq "LLVM") { if ($env:USE_TOOLSET -eq "LLVM") {
clang-cl --version clang-cl --version
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=lld-link cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=lld-link
} }
else { else {
cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"