Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22274 - servo:jdm-patch-10, r=nox

Browse source 
Update the manifest twice to work around manifest generation issue.

My theory is that the new VCS-based cache that's used when generating the manifest gets confused when files that match a gitignore rule are added for the first time. Updating the manifest twice makes the problematic files disappear from the manifest, and I'm not inclined to spend any more time chasing this bug. Fixes #22275.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22274)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-27 10:16:45 -05:00 • committed by GitHub
commit e7d4e65660
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/ci/update-wpt-checkout
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/22275).
./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.