From 59500cdcc7c26beb2968c91bb0dd7a065c435b05 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 26 Nov 2018 22:34:33 -0500
Subject: [PATCH] Update the manifest twice to work around manifest generation
 issue.

---
 etc/ci/update-wpt-checkout | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout
index 443babf9716..c0a58124d30 100755
--- a/etc/ci/update-wpt-checkout
+++ b/etc/ci/update-wpt-checkout
@@ -42,9 +42,11 @@ function unsafe_pull_from_upstream() {
 
     # 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/22235).
+    ./mach update-manifest || return 4
 
     # Amend the existing commit with the new changes from updating the manifest.
-    git commit -a --amend --no-edit || return 4
+    git commit -a --amend --no-edit || return 5
 }
 
 # Remove all local traces of this sync operation.