…

etc/ci/update-wpt-checkout

@@ -31,28 +31,28 @@ function latest_git_commit() {
 function unsafe_pull_from_upstream() {
     git checkout -b "${1}" || return 1
 
-    OLD_COMMIT=$(latest_git_commit)
+#    OLD_COMMIT=$(latest_git_commit)
 
-    # Fetch all changes from upstream WPT and automatically transpose them
-    # into a single servo commit.
-    ./mach update-wpt --sync --no-upstream --patch || return 2
+#    # Fetch all changes from upstream WPT and automatically transpose them
+#    # into a single servo commit.
+#    ./mach update-wpt --sync --no-upstream --patch || return 2
 
-    # If there was no new commit created, there are no changes that need syncing.
-    # Skip the remaining steps.
-    if [[ "$(latest_git_commit)" == "${OLD_COMMIT}" ]]; then
-        return 255
-    fi
+#    # If there was no new commit created, there are no changes that need syncing.
+#    # Skip the remaining steps.
+#    if [[ "$(latest_git_commit)" == "${OLD_COMMIT}" ]]; then
+#        return 255
+#    fi
 
-    # Update the manifest to include the new changes.
-    ./mach update-manifest || return 3
-    # Update the manifest again to reach a fixed state (https://github.com/servo/servo/issues/22275).
-    ./mach update-manifest || return 4
+#    # Update the manifest to include the new changes.
+#    ./mach update-manifest || return 3
+#    # Update the manifest again to reach a fixed state (https://github.com/servo/servo/issues/22275).
+#    ./mach update-manifest || return 4
 
-    # Clean up any now-unused test results.
-    (python3 etc/unused_wpt_results.py | xargs rm -rfv) || return 5
+#    # Clean up any now-unused test results.
+#    (python3 etc/unused_wpt_results.py | xargs rm -rfv) || return 5
 
-    # Amend the existing commit with the new changes from updating the manifest.
-    git commit -a --amend --no-edit || return 6
+#    # Amend the existing commit with the new changes from updating the manifest.
+#    git commit -a --amend --no-edit || return 6
 }
 
 # Remove all local traces of this sync operation.
@@ -86,7 +86,7 @@ function unsafe_update_metadata() {
     # Ensure any new directories or ini files are included in these changes.
     git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2
     # Merge all changes with the existing commit.
-    git commit -a --amend --no-edit || return 3
+    git commit -a -m "Update WPT" || return 3
 }
 
 # Push the branch to a remote branch, then open a PR for the branch
@@ -122,7 +122,7 @@ function unsafe_open_pull_request() {
     BODY+="r? @servo-wpt-sync\n"
     cat <<EOF >prdata.json || return 4
 {
-  "title": "Sync WPT with upstream (${CURRENT_DATE})",
+  "title": "[Do not merge] Sync WPT with upstream (${CURRENT_DATE}), from Linux",
   "head": "${WPT_SYNC_USER}:${REMOTE_BRANCH_NAME}",
   "base": "master",
   "body": "${BODY}",
@@ -136,11 +136,11 @@ EOF
                             --data @prdata.json \
                             https://api.github.com/repos/servo/servo/pulls) || return 5
 
-    echo "${OPEN_PR_RESPONSE}" | \
-        jq '.review_comments_url' | \
-        sed 's/pulls/issues/' | \
-        xargs curl -H "Authorization: token ${WPT_SYNC_TOKEN}" \
-                   --data "{\"body\":\"@bors-servo r+\"}" || return 6
+#    echo "${OPEN_PR_RESPONSE}" | \
+#        jq '.review_comments_url' | \
+#        sed 's/pulls/issues/' | \
+#        xargs curl -H "Authorization: token ${WPT_SYNC_TOKEN}" \
+#                   --data "{\"body\":\"@bors-servo r+\"}" || return 6
 }
 
 function pull_from_upstream() {

etc/taskcluster/decision_task.py

@@ -105,14 +105,14 @@ def tasks(task_for):
     # https://tools.taskcluster.net/hooks/project-servo/daily
     elif task_for == "daily":
         daily_tasks_setup()
-        with_rust_nightly()
-        linux_nightly()
-        android_nightly()
-        windows_nightly()
-        macos_nightly()
+#        with_rust_nightly()
+#        linux_nightly()
+#        android_nightly()
+#        windows_nightly()
+#        macos_nightly()
         update_wpt()
-        magicleap_nightly()
-        uwp_nightly()
+#        magicleap_nightly()
+#        uwp_nightly()
 
 
 # These are disabled in a "real" decision task,
@@ -579,7 +579,7 @@ def macos_nightly():
 
 
 def update_wpt():
-    build_task = linux_release_build_with_debug_assertions(layout_2020=False)
+    build_task = "bF0hlwveRhao8KhkwdG_uQ"#linux_release_build_with_debug_assertions(layout_2020=False)
     return (
         linux_task("WPT update")
         .with_treeherder("Linux x64", "WPT update")
@@ -592,6 +592,7 @@ def update_wpt():
         .with_repo()
         .with_curl_artifact_script(build_task, "target.tar.gz")
         .with_script("""
+            apt-get install --no-install-recommends -y python3 jq
             tar -xzf target.tar.gz
             # Use `cat` to force wptrunner’s non-interactive mode
             ./etc/ci/update-wpt-checkout fetch-and-update-expectations | cat
@@ -793,27 +794,27 @@ def wpt_chunks(platform, make_chunk_task, build_task, total_chunks, processes,
 def daily_tasks_setup():
     # ':' is not accepted in an index namepspace:
     # https://docs.taskcluster.net/docs/reference/core/taskcluster-index/references/api
-    now = SHARED.now.strftime("%Y-%m-%d_%H-%M-%S")
-    index_path = "%s.daily.%s" % (CONFIG.index_prefix, now)
-    # Index this task manually rather than with a route,
-    # so that it is indexed even if it fails.
-    SHARED.index_service.insertTask(index_path, {
-        "taskId": CONFIG.decision_task_id,
-        "rank": 0,
-        "data": {},
-        "expires": SHARED.from_now_json(log_artifacts_expire_in),
-    })
+#    now = SHARED.now.strftime("%Y-%m-%d_%H-%M-%S")
+#    index_path = "%s.daily.%s" % (CONFIG.index_prefix, now)
+#    # Index this task manually rather than with a route,
+#    # so that it is indexed even if it fails.
+#    SHARED.index_service.insertTask(index_path, {
+#        "taskId": CONFIG.decision_task_id,
+#        "rank": 0,
+#        "data": {},
+#        "expires": SHARED.from_now_json(log_artifacts_expire_in),
+#    })
 
     # Unlike when reacting to a GitHub push event,
     # the commit hash is not known until we clone the repository.
     CONFIG.git_sha_is_current_head()
 
     # On failure, notify a few people on IRC
     # https://docs.taskcluster.net/docs/reference/core/taskcluster-notify/docs/usage
-    notify_route = "notify.irc-channel.#servo.on-failed"
-    CONFIG.routes_for_all_subtasks.append(notify_route)
-    CONFIG.scopes_for_all_subtasks.append("queue:route:" + notify_route)
-    CONFIG.task_name_template = "Servo daily: %s. On failure, ping: " + ping_on_daily_task_failure
+#    notify_route = "notify.irc-channel.#servo.on-failed"
+#    CONFIG.routes_for_all_subtasks.append(notify_route)
+#    CONFIG.scopes_for_all_subtasks.append("queue:route:" + notify_route)
+#    CONFIG.task_name_template = "Servo daily: %s. On failure, ping: " + ping_on_daily_task_failure
 
 
 def dockerfile_path(name):