From 8dfb04f5db891dc13aabcb185d7031cfc6c67da2 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Tue, 28 May 2019 08:27:06 +0200 Subject: [PATCH 1/2] let's try the multi-line cmd again --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f7a92c75b..a8efd691d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,10 +3,10 @@ image: - Visual Studio 2017 - Visual Studio 2015 build_script: - - if "Visual Studio 2017"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - - if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - - nmake -f makefile.msvc all - +- cmd: >- + if "Visual Studio 2017"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 + if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + nmake -f makefile.msvc all test_script: - - test.exe +- cmd: test.exe From 7878db68001a26725b2ccc64ba38d1f4c67dd8c6 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Tue, 28 May 2019 08:28:32 +0200 Subject: [PATCH 2/2] use correct version and only build specific branches --- appveyor.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a8efd691d..c4a13a054 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,10 @@ -version: 1.0.{build} +version: 1.1.0-{build} +branches: + only: + - master + - develop + - /^release/ + - /^travis/ image: - Visual Studio 2017 - Visual Studio 2015