From 5b050d093ec1908960ddbecc07fb16afa75f0dbe Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 23 Feb 2018 10:21:52 -0500 Subject: [PATCH 1/2] Include non-upstream metadata changes in WPT sync. --- etc/ci/update-wpt-checkout | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index 648de52f926..1fcc960b7e9 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -67,12 +67,10 @@ function unsafe_run_tests() { # last commit with the new results. function unsafe_update_metadata() { ./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. - git add tests/wpt/metadata || return 3 + git add tests/wpt/ || return 2 # 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 From 86e4fa50d3df0c9c37e3674009fd68f1d872fc16 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 23 Feb 2018 12:58:56 -0500 Subject: [PATCH 2/2] Refine the set of directories that are checked during WPT syncing. --- 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 1fcc960b7e9..c6495e51c40 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -68,7 +68,7 @@ function unsafe_run_tests() { function unsafe_update_metadata() { ./mach update-wpt "${1}" || return 1 # Ensure any new directories or ini files are included in these changes. - git add tests/wpt/ || return 2 + git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2 # Merge all changes with the existing commit. git commit -a --amend --no-edit || return 3 }