From a62fb72ce4e0b7cb287dad188b2cf940178cde06 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 20 Aug 2019 17:50:03 -0400
Subject: [PATCH] Add x64 UWP to CI.

---
 etc/taskcluster/decision_task.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 2d73448eaeb..fee990f3252 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -29,6 +29,7 @@ def main(task_for):
             linux_tidy_unit_docs,
             windows_unit,
             windows_arm64,
+            windows_uwp_x64,
             macos_unit,
             magicleap_dev,
             android_arm32_dev,
@@ -54,7 +55,7 @@ def main(task_for):
 
             "try-mac": [macos_unit],
             "try-linux": [linux_tidy_unit_docs, linux_release],
-            "try-windows": [windows_unit, windows_arm64],
+            "try-windows": [windows_unit, windows_arm64, windows_uwp_x64],
             "try-magicleap": [magicleap_dev],
             "try-arm": [windows_arm64],
             "try-wpt": [linux_wpt],
@@ -374,7 +375,7 @@ def android_x86_wpt():
 
 def windows_arm64():
     return (
-        windows_build_task("Dev build", arch="arm64", package=False)
+        windows_build_task("UWP dev build", arch="arm64", package=False)
         .with_treeherder("Windows arm64")
         .with_file_mount(
             "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe",
@@ -385,7 +386,24 @@ def windows_arm64():
               -Version 2.1.13 -o %HOMEDRIVE%%HOMEPATH%\\repo\\support\\hololens\\packages",
         )
         .with_script("python mach build --dev --uwp --win-arm64")
-        .find_or_create("build.windows_arm64_dev." + CONFIG.task_id())
+        .find_or_create("build.windows_uwp_arm64_dev." + CONFIG.task_id())
+    )
+
+
+def windows_uwp_x64():
+    return (
+        windows_build_task("UWP dev build", package=False)
+        .with_treeherder("Windows x64")
+        .with_file_mount(
+            "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe",
+            path="nuget.exe"
+        )
+        .with_script(
+            "%HOMEDRIVE%%HOMEPATH%\\nuget.exe install ANGLE.WindowsStore.Servo \
+              -Version 2.1.13 -o %HOMEDRIVE%%HOMEPATH%\\repo\\support\\hololens\\packages",
+        )
+        .with_script("mach build --dev --uwp")
+        .find_or_create("build.windows_uwp_x64_dev." + CONFIG.task_id())
     )