From 687c2e8cfc509613f277cbed66f1eb12f67683cc Mon Sep 17 00:00:00 2001
From: calebboyd <caleb.boyd@gmail.com>
Date: Tue, 31 Jul 2018 18:00:37 -0500
Subject: [PATCH] chore(ci): use appveyor build matrix for handling > 10 builds

---
 appveyor.yml    |  4 +++-
 src/releases.ts |  2 +-
 tasks/ci.ts     | 10 ++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 846a04c..3cddc78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,6 @@
-image: Visual Studio 2017
+image:
+  - Visual Studio 2017
+  - Visual Studio 2015
 environment:
   CIRCLE_TOKEN:
     secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
diff --git a/src/releases.ts b/src/releases.ts
index c203ff0..b4bc8ea 100644
--- a/src/releases.ts
+++ b/src/releases.ts
@@ -34,7 +34,7 @@ async function getJson<T>(url: string, options?: any) {
 
 function isBuildableVersion(version: string) {
   const major = +version.split('.')[0]
-  return !~[0, 1, 2, 3, 4, 5, 7].indexOf(major) || version === '4.8.4'
+  return !~[0, 1, 2, 3, 4, 5, 7, 8, 10].indexOf(major) || version === '4.8.4'
 }
 
 export function getLatestGitRelease(options?: any) {
diff --git a/tasks/ci.ts b/tasks/ci.ts
index 70e9153..a7b580b 100644
--- a/tasks/ci.ts
+++ b/tasks/ci.ts
@@ -45,7 +45,13 @@ export function triggerDockerBuild(release: NexeTarget, branch: string) {
 }
 
 export function triggerWindowsBuild(release: NexeTarget) {
-  const hasVersion = 'NEXE_VERSION' in env
-  env.NEXE_VERSION = hasVersion ? env.NEXE_VERSION!.trim() : release.toString()
+  const version = 'NEXE_VERSION' in env ? env.NEXE_VERSION!.trim() : release.version
+  if (version.startsWith('10.')) {
+    if ((env.APPVEYOR_BUILD_WORKER_IMAGE || '').includes('2017')) {
+      env.NEXE_VERSION = version
+    }
+  } else {
+    env.NEXE_VERSION = version
+  }
   return Promise.resolve()
 }