Update the manifest twice to work around manifest generation issue.

This commit is contained in:
Josh Matthews 2018-11-26 22:34:33 -05:00 committed by GitHub
parent 524bd722ef
commit 59500cdcc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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.