From 8fcf88f2aacd45b73bcf5cac04403b3ee8044094 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Tue, 20 Dec 2016 14:33:44 -0600
Subject: [PATCH] Create windows-gnu and windows-msvc builds

---
 etc/ci/buildbot_steps.yml | 22 +++++++++++++++++++++-
 etc/ci/upload_nightly.sh  |  5 +++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index 69353c304eac..0a0802fb689f 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -106,7 +106,27 @@ windows-dev:
   - ./mach test-unit
   - ./mach build-geckolib
 
+windows-gnu-dev:
+  - ./mach build --dev
+  - ./mach test-unit
+  - ./mach build-geckolib
+
+windows-msvc-dev:
+  - mach.bat build --dev
+  - mach.bat test-unit
+  - mach.bat build-geckolib
+
 windows-nightly:
   - ./mach build --release
   - ./mach package --release
-  - ./etc/ci/upload_nightly.sh windows
+  - ./etc/ci/upload_nightly.sh windows-gnu
+
+windows-nightly-gnu:
+  - ./mach build --release
+  - ./mach package --release
+  - ./etc/ci/upload_nightly.sh windows-gnu
+
+windows-nightly-msvc:
+  - mach.bat build --release
+  - mach.bat package --release
+  - .\etc\ci\upload_nightly.sh windows-msvc
diff --git a/etc/ci/upload_nightly.sh b/etc/ci/upload_nightly.sh
index 3e8f0f9580f0..bc9e82824eeb 100755
--- a/etc/ci/upload_nightly.sh
+++ b/etc/ci/upload_nightly.sh
@@ -11,7 +11,7 @@ shopt -s failglob
 
 
 usage() {
-    printf "usage: ${0} android|linux|mac|macbrew|windows\n"
+    printf "usage: ${0} android|linux|mac|macbrew|windows-gnu|windows-msvc\n"
 }
 
 
@@ -48,7 +48,8 @@ main() {
     elif [[ "${platform}" == "macbrew" ]]; then
         extension=tar.gz
         package=target/release/brew/*."${extension}"
-    elif [[ "${platform}" == "windows" ]]; then
+    elif [[ "${platform}" == "windows-gnu" ||
+            "${platform}" == "windows-msvc" ]]; then
         extension=msi
         package=target/release/msi/*.msi
     else