para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2025-03-16 19:17:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix logic error in workaround

Browse Source
This commit is contained in:
Roelf-Jilling 2018-11-17 20:47:35 +01:00
parent bce6ed2338
commit cadb43819b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
appveyor.yml
View File

@ -42,17 +42,18 @@ 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"
} }
# Workaround for lld bug with vcpkg integration # Workaround for lld bug with vcpkg integration
- ps: | if ($env:USE_TOOLSET -eq "LLVM") {
if ($env:USE_TOOLSET -eq "LLVM" -and if (
(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..." echo "Updating vcpkg..."
cd C:\Tools\vcpkg cd C:\Tools\vcpkg
git pull --quiet git pull --quiet
cd "$env:APPVEYOR_BUILD_FOLDER" cd "$env:APPVEYOR_BUILD_FOLDER"
} else { } else {
echo "==> vcpkg has been updated, please remove the workaround from appveyor.yml." echo "==> vcpkg has been updated, please remove the workaround from appveyor.yml."
}
} }
before_build: before_build: