From e5a3b5588b1b0385adbbe2715a8507393d65cf33 Mon Sep 17 00:00:00 2001
From: Daniel Neus <d.neus@sirrix.com>
Date: Mon, 13 Mar 2017 22:54:35 +0100
Subject: Add VS2017 builds

---
 src/scripts/ci/appveyor.yml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml
index bcc5b118a..eef1e758c 100644
--- a/src/scripts/ci/appveyor.yml
+++ b/src/scripts/ci/appveyor.yml
@@ -1,10 +1,8 @@
-os: Visual Studio 2015
-
 # Let's call MSVS 2015 the default compiler, 64 bit the default architecture,
 # release the default configuration and --enable-shared the default mode.
 #
 # Build jobs
-#  1. four basic builds: 32/64bit on MSVS2013/2015
+#  1. six basic builds: 32/64bit on MSVS2013/2015/2017
 #  2. add static lib and amalgamation
 #  3. add a debug build on MSVS2013/2015
 #
@@ -18,36 +16,54 @@ environment:
       PLATFORM: x86
       CONFIG:
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - MSVS: 2013
       PLATFORM: x86_amd64
       CONFIG:
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - MSVS: 2015
       PLATFORM: x86
       CONFIG:
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - MSVS: 2015
       PLATFORM: x86_amd64
       CONFIG:
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - MSVS: 2017
+      PLATFORM: x86
+      CONFIG:
+      MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - MSVS: 2017
+      PLATFORM: x86_amd64
+      CONFIG:
+      MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     # 2
     - MSVS:
       PLATFORM:
       CONFIG:
       MODE: --disable-shared
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - MSVS:
       PLATFORM:
       CONFIG:
       MODE: --amalgamation
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     # 3
     - MSVS: 2013
       PLATFORM:
       CONFIG: Debug
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     - MSVS: 2015
       PLATFORM:
       CONFIG: Debug
       MODE:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 install:
   # Set defaults
@@ -66,6 +82,9 @@ install:
   - if %MSVS% == 2015 (
        call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
     )
+  - if %MSVS% == 2017 (
+       call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
+    )
   - cl # check compiler version
   
   - appveyor DownloadFile http://download.qt.io/official_releases/jom/jom.zip -FileName jom.zip
-- 
cgit v1.2.3