Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 17:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20112 - servo:jdm-patch-11, r=asajeffrey

Browse source 
Include non-upstream metadata changes in WPT sync.

The original sync work excluded changes to metadata files under tests/wpt/mozilla under the assumption that any change in test results indicated an existing intermittent issue. This is incorrect, because these tests rely on shared infrastructure with upstream, so the results can be influenced by syncing.

<!-- 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/20112)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-02-23 13:55:06 -05:00 • committed by GitHub
commit 8329a45163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/ci/update-wpt-checkout
View file

@ -67,12 +67,10 @@ function unsafe_run_tests() {
# last commit with the new results. # last commit with the new results.
function unsafe_update_metadata() { function unsafe_update_metadata() {
./mach update-wpt "${1}" || return 1 ./mach update-wpt "${1}" || return 1
# Ignore any metadata changes to files that weren't modified by this sync.
git checkout -- tests/wpt/mozilla/meta || return 2
# Ensure any new directories or ini files are included in these changes. # Ensure any new directories or ini files are included in these changes.
git add tests/wpt/metadata || return 3 git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2
# Merge all changes with the existing commit. # Merge all changes with the existing commit.
git commit -a --amend --no-edit || return 4 git commit -a --amend --no-edit || return 3
} }
# Push the branch to a remote branch, then open a PR for the branch # Push the branch to a remote branch, then open a PR for the branch