chore(ci): use appveyor build matrix for handling > 10 builds

This commit is contained in:
calebboyd
2018-07-31 18:00:37 -05:00
parent 4eeeb55706
commit 687c2e8cfc
3 changed files with 12 additions and 4 deletions
+3 -1
View File
@@ -1,4 +1,6 @@
image: Visual Studio 2017
image:
- Visual Studio 2017
- Visual Studio 2015
environment:
CIRCLE_TOKEN:
secure: TQKcepXmTzCNt4+tUBtYpwEQkdSPwFr9A8ugtoMhNbKu/SW1WM1EpjEu6kYXxpQ4
+1 -1
View File
@@ -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) {
+8 -2
View File
@@ -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()
}