From b667bbe2caf7e7d285b225794f6ae041bdf36093 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Fri, 6 Mar 2020 21:02:18 +0100
Subject: appveyor: sort builds by type and add two new variants

Related to #5034 and #5063
---
 appveyor.yml | 70 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3b5b66445..c672ac96d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,6 +24,7 @@ version: 7.50.0.{build}
 
 environment:
     matrix:
+      # generated CMake-based Visual Studio Release builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 9 2008"
@@ -39,26 +40,27 @@ environment:
         BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 16 2019"
         TARGET: "-A x64"
-        PRJ_CFG: Debug
-        OPENSSL: OFF
-        WINSSL: ON
+        PRJ_CFG: Release
+        OPENSSL: ON
+        WINSSL: OFF
         HTTP_ONLY: OFF
-        TESTING: ON
-        SHARED: OFF
-        DISABLED_TESTS: "~1139"
+        TESTING: OFF
+        SHARED: ON
+        DISABLED_TESTS: ""
         COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 16 2019"
-        TARGET: "-A x64"
+        TARGET: "-A ARM64"
         PRJ_CFG: Release
-        OPENSSL: ON
-        WINSSL: OFF
+        OPENSSL: OFF
+        WINSSL: ON
         HTTP_ONLY: OFF
         TESTING: OFF
-        SHARED: ON
+        SHARED: OFF
         DISABLED_TESTS: ""
         COMPILER_PATH: ""
+      # generated CMake-based Visual Studio Debug builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 10 2010 Win64"
@@ -70,6 +72,18 @@ environment:
         SHARED: OFF
         DISABLED_TESTS: "~1139"
         COMPILER_PATH: ""
+      - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+        BUILD_SYSTEM: CMake
+        PRJ_GEN: "Visual Studio 16 2019"
+        TARGET: "-A x64"
+        PRJ_CFG: Debug
+        OPENSSL: OFF
+        WINSSL: ON
+        HTTP_ONLY: OFF
+        TESTING: ON
+        SHARED: OFF
+        DISABLED_TESTS: "~1139"
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "Visual Studio 16 2019"
@@ -94,12 +108,13 @@ environment:
         SHARED: OFF
         DISABLED_TESTS: "~1139"
         COMPILER_PATH: ""
+      # generated CMake-based MSYS Makefiles builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "MSYS Makefiles"
         PRJ_CFG: Debug
         OPENSSL: OFF
-        WINSSL: OFF
+        WINSSL: ON
         HTTP_ONLY: OFF
         TESTING: ON
         SHARED: OFF
@@ -107,6 +122,19 @@ environment:
         COMPILER_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin"
         MSYS2_ARG_CONV_EXCL: "/*"
         BUILD_OPT: -k
+      - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+        BUILD_SYSTEM: CMake
+        PRJ_GEN: "MSYS Makefiles"
+        PRJ_CFG: Debug
+        OPENSSL: OFF
+        WINSSL: ON
+        HTTP_ONLY: OFF
+        TESTING: ON
+        SHARED: OFF
+        DISABLED_TESTS: "~1139"
+        COMPILER_PATH: "C:\\mingw-w64\\x86_64-7.2.0-posix-seh-rt_v5-rev1\\mingw64\\bin"
+        MSYS2_ARG_CONV_EXCL: "/*"
+        BUILD_OPT: -k
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: CMake
         PRJ_GEN: "MSYS Makefiles"
@@ -133,6 +161,7 @@ environment:
         COMPILER_PATH: "C:\\MinGW\\bin"
         MSYS2_ARG_CONV_EXCL: "/*"
         BUILD_OPT: -k
+      # winbuild-based builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: winbuild_vs2015
         DEBUG: yes
@@ -153,28 +182,23 @@ environment:
         DEBUG: no
         PATHPART: release
         TESTING: OFF
+      # generated VisualStudioSolution-based builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         BUILD_SYSTEM: VisualStudioSolution
         PRJ_CFG: "DLL Debug - DLL Windows SSPI - DLL WinIDN"
         TESTING: OFF
         VC_VERSION: VC15
-      - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
-        BUILD_SYSTEM: CMake
-        PRJ_GEN: "Visual Studio 16 2019"
-        TARGET: "-A ARM64"
-        PRJ_CFG: Release
-        OPENSSL: OFF
-        WINSSL: ON
-        HTTP_ONLY: OFF
-        TESTING: OFF
-        SHARED: OFF
-        DISABLED_TESTS: ""
-        COMPILER_PATH: ""
+      # autotools-based builds
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         BUILD_SYSTEM: autotools
         TESTING: ON
         DISABLED_TESTS: "~19 ~1056 ~1233 ~1242 ~1243 ~2002 ~2003"
         CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver --disable-proxy"
+      - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+        BUILD_SYSTEM: autotools
+        TESTING: ON
+        DISABLED_TESTS: "~19 ~1056 ~1233 ~1242 ~1243 ~2002 ~2003"
+        CONFIG_ARGS: "--enable-debug --enable-werror --enable-alt-svc --disable-threaded-resolver"
 
 install:
     - set "PATH=C:\msys64\usr\bin;%PATH%"
-- 
cgit v1.2.1