mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update the manifest twice to work around manifest generation issue.
This commit is contained in:
parent
524bd722ef
commit
59500cdcc7
1 changed files with 3 additions and 1 deletions
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue