Create windows-gnu and windows-msvc builds

servo · Dec 22, 2016 · 8fcf88f · 8fcf88f
1 parent fd5733f
commit 8fcf88f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git 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
@@ -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