From 59500cdcc7c26beb2968c91bb0dd7a065c435b05 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 26 Nov 2018 22:34:33 -0500 Subject: [PATCH 1/2] 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. From 8c29eeaf8f0f9990a60927ae032f7c42d4842f4e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 26 Nov 2018 22:39:06 -0500 Subject: [PATCH 2/2] Fix issue reference in comment. --- etc/ci/update-wpt-checkout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index c0a58124d30..75c8fcdc40f 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -42,7 +42,7 @@ 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). + # Update the manifest again to reach a fixed state (https://github.com/servo/servo/issues/22275). ./mach update-manifest || return 4 # Amend the existing commit with the new changes from updating the manifest.