From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sat, 27 Nov 2021 02:29:26 +0000 (+0000)
Subject: Use the newer appveyor images to build for VS2017 and VS2019.  Trim the number of... 
X-Git-Tag: json-c-0.16-20220414~27^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0910e18bbdfe6fac13ad74f0ec4e0d9f22d78fb6;p=thirdparty%2Fjson-c.git

Use the newer appveyor images to build for VS2017 and VS2019.  Trim the number of builds we do.
---

diff --git a/appveyor.yml b/appveyor.yml
index 581366db..d7b1e3cd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,31 +1,45 @@
 version: '{branch}.{build}'
-os: Windows Server 2012 R2
+
+image:
+  # VS2015 also used for earlier VS builds
+  # aka os: Windows Server 2012 R2
+  - Visual Studio 2015
+  # aka os: Windows Server 2016
+  - Visual Studio 2017
+  # aka os: Windows Server 2019
+  - Visual Studio 2019
 
 platform: x64
 
-# There should be a better way to set-up a build matrix.
-environment:
+for:
+-
   matrix:
-    - b_toolset: Windows7.1SDK
-      b_config: Debug
+    only:
+      - image: Visual Studio 2015
+
+  environment:
+    matrix:
+      - b_toolset: Windows7.1SDK
+        b_config: Debug
 
-    - b_toolset: Windows7.1SDK
-      b_config: Release
+      - b_toolset: v120
+        b_config: Debug
 
-    - b_toolset: v120
-      b_config: Debug
+      - b_toolset: v140
+        b_config: Debug
 
-    - b_toolset: v120
-      b_config: Release
+  build_script:
+    - cmake -T %b_toolset% -DCMAKE_BUILD_TYPE=%b_config% -DCMAKE_INSTALL_PREFIX=t_install .
+    - cmake --build . --target install
 
-    - b_toolset: v140
-      b_config: Debug
+environment:
+  matrix:
+    - b_config: Debug
 
-    - b_toolset: v140
-      b_config: Release
+    - b_config: Release
 
 build_script:
-- cmake -T %b_toolset% -DCMAKE_BUILD_TYPE=%b_config% -DCMAKE_INSTALL_PREFIX=t_install .
+- cmake -DCMAKE_BUILD_TYPE=%b_config% -DCMAKE_INSTALL_PREFIX=t_install .
 - cmake --build . --target install
 
 after_build: