From 84b0eac3b13289f587986c5f12adc888ef62572c Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 28 Jan 2020 17:02:50 -0800
Subject: [PATCH] Add Windows 1809 images to AppVeyor configuration

---
 .appveyor.yml | 12 ++++++++++++
 update.sh     |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9e66eec4..1225ca58 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,12 +3,24 @@ image: Visual Studio 2017
 
 environment:
   matrix:
+    - version: 1.14-rc
+      variant: windowsservercore-1809
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - version: 1.14-rc
       variant: windowsservercore-ltsc2016
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - version: 1.13
+      variant: windowsservercore-1809
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - version: 1.13
       variant: windowsservercore-ltsc2016
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - version: 1.12
+      variant: windowsservercore-1809
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - version: 1.12
       variant: windowsservercore-ltsc2016
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
 install:
   - ps: |
diff --git a/update.sh b/update.sh
index 1c35938d..4b09191b 100755
--- a/update.sh
+++ b/update.sh
@@ -118,8 +118,13 @@ for version in "${versions[@]}"; do
 
 			case "$winVariant" in
 				nanoserver-*) ;; # nanoserver images COPY --from=...:...-windowsservercore-...
-				*-1809) ;; # no AppVeyor or Travis support for 1809: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
-				*) appveyorEnv='\n    - version: '"$version"'\n      variant: '"$winVariant$appveyorEnv" ;;
+				# https://www.appveyor.com/docs/windows-images-software/
+				*-1809)
+					appveyorEnv='\n    - version: '"$version"'\n      variant: '"$winVariant"'\n      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019'"$appveyorEnv"
+					;;
+				*-ltsc2016)
+					appveyorEnv='\n    - version: '"$version"'\n      variant: '"$winVariant"'\n      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017'"$appveyorEnv"
+					;;
 			esac
 		fi
 	done