Auto merge of #23327 - servo:daily, r=jdm

Fix Servo Nightly uploads

CC https://github.com/servo/servo/issues/23320.
Closes https://github.com/servo/servo/pull/23326.

Tasks running with this configuration, all green except the last which is still running as of this writing:

* Windows: https://tools.taskcluster.net/groups/dZvq6KJpQVSTzrnKwA5JQg/tasks/RaEwj-wWRSm1qmNytjAG8A/details
* Linux: https://tools.taskcluster.net/groups/JU6A3xS2TTq4dTL3LY39QQ/tasks/YDbSZr9wTHq6U3obG3ZstQ/details
* Android: https://tools.taskcluster.net/groups/FkLah26vSIyKDUwfADUkGw/tasks/JNokEsu2SCmAGL3ZK2Uj7g/details
* macOS: https://tools.taskcluster.net/groups/CtheiEigRYinJjqYlDMuZQ/tasks/XPqUzikPQnybmc6wP8AL-w/details
* WPT update: https://tools.taskcluster.net/groups/JU6A3xS2TTq4dTL3LY39QQ/tasks/MNutIoMWT9KvB19TS2FsXA/details

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23327)
<!-- Reviewable:end -->

1 files changed, 38 insertions, 28 deletions

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index e5b16c5b952..04012248a2e 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -90,10 +90,10 @@ def main(task_for):
         daily_tasks_setup()
         with_rust_nightly()
         linux_nightly()
-        android_nightly("arm")
-        android_nightly("x86")
+        android_nightly()
         windows_nightly()
         macos_nightly()
+        update_wpt()
 
 
 # These are disabled in a "real" decision task,
@@ -264,36 +264,27 @@ def android_arm32_dev():
     )
 
 
-def android_nightly(job):
-    details = {
-        "arm": {
-            "mach_flag": "--android",
-            "name": "ARMv7",
-            "target": "armv7-linux-androideabi",
-        },
-        "x86": {
-            "mach_flag": "--target i686-linux-android",
-            "name": "x86",
-            "target": "i686-linux-android",
-        }
-    }
-
+def android_nightly():
     return (
         android_build_task("Nightly build and upload")
-        .with_treeherder("Android " + details[job]["name"], "Nightly")
+        .with_treeherder("Android Nightlies")
         .with_features("taskclusterProxy")
         .with_scopes("secrets:get:project/servo/s3-upload-credentials")
         .with_script("""
-            ./mach build {flag} --release
-            ./mach package {flag} --release --maven
+            ./mach build --release --android
+            ./mach package --release --android --maven
+            ./mach build --release --target i686-linux-android
+            ./mach package --release --target i686-linux-android --maven
             ./mach upload-nightly android --secret-from-taskcluster
             ./mach upload-nightly maven --secret-from-taskcluster
-        """.format(flag=details[job]["mach_flag"]))
+        """)
         .with_artifacts(
-            "/repo/target/android/%s/release/servoapp.apk" % details[job]["target"],
-            "/repo/target/android/%s/release/servoview.aar" % details[job]["target"],
+            "/repo/target/android/armv7-linux-androideabi/release/servoapp.apk",
+            "/repo/target/android/armv7-linux-androideabi/release/servoview.aar",
+            "/repo/target/android/i686-linux-android/release/servoapp.apk",
+            "/repo/target/android/i686-linux-android/release/servoview.aar",
         )
-        .find_or_create(("build.android_%s_nightly." + CONFIG.git_sha) % details[job]["name"].lower())
+        .find_or_create("build.android_nightlies." + CONFIG.git_sha)
     )
 
 
@@ -395,6 +386,7 @@ def windows_nightly():
     return (
         windows_build_task("Nightly build and upload")
         .with_treeherder("Windows x64", "Nightly")
+        .with_features("taskclusterProxy")
         .with_scopes("secrets:get:project/servo/s3-upload-credentials")
         .with_script("mach build --release",
                      "mach package --release",
@@ -459,15 +451,33 @@ def macos_nightly():
             "./mach upload-nightly mac --secret-from-taskcluster",
         )
         .with_artifacts("repo/target/release/servo-tech-demo.dmg")
-        .with_script(
-            "./etc/ci/update-wpt-checkout fetch-and-update-expectations",
-            "./etc/ci/update-wpt-checkout open-pr",
-            "./etc/ci/update-wpt-checkout cleanup",
-        )
         .find_or_create("build.mac_x64_nightly." + CONFIG.git_sha)
     )
 
 
+def update_wpt():
+    # Reuse the release build that was made for landing the PR
+    build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha)
+    return (
+        macos_task("WPT update")
+        .with_python2()
+        .with_treeherder("macOS x64", "WPT update")
+        .with_features("taskclusterProxy")
+        .with_scopes("secrets:get:project/servo/wpt-sync")
+        .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
+        .with_max_run_time_minutes(5 * 60)
+        .with_repo()
+        .with_curl_artifact_script(build_task, "target.tar.gz")
+        .with_script("""
+            tar -xzf target.tar.gz
+            ./etc/ci/update-wpt-checkout fetch-and-update-expectations
+            ./etc/ci/update-wpt-checkout open-pr
+            ./etc/ci/update-wpt-checkout cleanup
+        """)
+        .find_or_create("wpt_update." + CONFIG.git_sha)
+    )
+
+
 def macos_wpt():
     build_task = (
         macos_build_task("Release build")