commit 18ecd1b0

sum01 · 2018-04-20 03:20
18ecd1b06a0f331a382c49239df766875e12c22e patch · browse files
parent d7909cdcbb6fc1f300d09d5f86541dfc287d4a95

Fix appveyor.yml (hopefully)
Apparently cmd prompt expands vars and they go poof during comparisions, unless you quote them...

Changed files

M	appveyor.yml before

diff --git a/appveyor.yml b/appveyor.yml index 739fbf2..35b4841 100644 --- a/appveyor.yml +++ b/appveyor.yml

@@ -49,14 +49,14 @@ before_build:

- cmd: mkdir c:\projects\platform_folders\build

- cmd: cd c:\projects\platform_folders\build

# I know this is ugly, but the matrix didn't work, and newlines seem to not be supported

- - cmd: IF %APPVEYOR_BUILD_WORKER_IMAGE%=="Visual Studio 2015" (IF %PLATFORM%=="x86" (cmake -G "Visual Studio 14 2015" ..) ELSE (cmake -G "Visual Studio 14 2015 Win64" -T host=x64 ..)) ELSE (IF %PLATFORM%=="x86" (cmake -G "Visual Studio 15 2017" ..) ELSE (cmake -G "Visual Studio 15 2017 Win64" -T host=x64 ..))

+ - cmd: IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (IF "%PLATFORM%"=="x86" (cmake -G "Visual Studio 14 2015" ..) ELSE (cmake -G "Visual Studio 14 2015 Win64" -T host=x64 ..)) ELSE (IF "%PLATFORM%"=="x86" (cmake -G "Visual Studio 15 2017" ..) ELSE (cmake -G "Visual Studio 15 2017 Win64" -T host=x64 ..))

# Runs MSBuild.exe with logging & some options

build:

# Allows for faster builds

parallel: true

# The solution file is the name of the project() given to Cmake

- project: platform_folders.sln

+ project: c:\projects\platform_folders\build\platform_folders.sln

# Trust me, you don't want higher than minimal. Even this is spammy

verbosity: minimal

@@ -67,7 +67,7 @@ build:

# to run your custom scripts instead of automatic tests

# The %CONFIGURATION% and %PLATFORM% variables are set from Appveyor as env-vars

test_script:

- - cmd: MSBuild.exe /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /v:minimal RUN_TESTS.vcxproj

+ - cmd: MSBuild.exe /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /v:minimal c:\projects\platform_folders\build\RUN_TESTS.vcxproj

#---------------------------------#

# global handlers #

@@ -75,4 +75,4 @@ test_script:

# on build failure dump cmake err log

on_failure:

- - cmd: type c:\projects\platform_folders\build\CMakeFiles\CMakeError.log

+ - cmd: IF exist c:\projects\platform_folders\build\CMakeFiles\CMakeError.log (type c:\projects\platform_folders\build\CMakeFiles\CMakeError.log)