From 5858231158adc9c04b4a5be3aa77d4386046ba3c Mon Sep 17 00:00:00 2001 From: ThePhD Date: Sun, 24 Mar 2019 19:21:58 -0400 Subject: [PATCH] try to get appveyor to work properly --- appveyor.yml | 2 +- scripts/run.linux.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5116937f..97ec54e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -130,7 +130,7 @@ init: - if "%PLATFORM%"=="x64" (set arch= Win64) - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set CMAKE_GENERATOR=Visual Studio 15 2017%arch%&&set parallelism=/maxcpucount) - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (set CMAKE_GENERATOR=Visual Studio 14 2015%arch%&&set parallelism=/maxcpucount) -- if "%SOL2_BUILD_NINJA%"=="1"(set CMAKE_GENERATOR=Ninja) +- if "%SOL2_BUILD_NINJA%"=="1"(set CMAKE_GENERATOR=Ninja&&set parallelism= ) - set lua_build_type=ON - set build_compiler=-DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe - set vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 diff --git a/scripts/run.linux.sh b/scripts/run.linux.sh index f459c905..1275d1e3 100644 --- a/scripts/run.linux.sh +++ b/scripts/run.linux.sh @@ -24,7 +24,7 @@ # # This script runs the actual project -echo -e "travis_fold:start:build_preparation.1\r" +echo -e "travis_fold:start:build_preparation\r" if [ -z "${SOL2_DIR}" ] then if [ "${SOL2_CI}" = true ] @@ -101,11 +101,11 @@ echo -e "travis_fold:start:build_preparation.1\r" fi mkdir -p Debug Release -echo -e "travis_fold:end:build_preparation.1\r" +echo -e "travis_fold:end:build_preparation\r" # show the tool and compiler versions we're using -echo -e "travis_fold:start:build_preparation.2\r" +echo -e "travis_fold:start:build_preparation\r" echo "=== Compiler and tool variables ===" ninja --version cmake --version @@ -113,7 +113,7 @@ echo -e "travis_fold:start:build_preparation.2\r" echo build_type_cc : "${build_type_cc}" echo build_type_cxx : "${build_type_cxx}" echo cmake defines : "${SOL2_CMAKE_DEFINES[@]}" -echo -e "travis_fold:end:build_preparation.2\r" +echo -e "travis_fold:end:build_preparation\r" echo -e "travis_fold:start:build.debug\r" cd Debug