diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-01-29 12:36:25 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-29 12:36:25 -0600 |
commit | 5f68abb190773f94d8fe3fa5da4ca2230f069fce (patch) | |
tree | afc11313a9383aa314368ddc88a3285e855498c7 | |
parent | 82922c97dc0313736fedb8021b205d4f84088a15 (diff) | |
parent | 3e323345a3603a36252bec92a703debffde9309c (diff) | |
download | servo-5f68abb190773f94d8fe3fa5da4ca2230f069fce.tar.gz servo-5f68abb190773f94d8fe3fa5da4ca2230f069fce.zip |
Auto merge of #19896 - servo:jdm-patch-7, r=aneeshusa
Address WPT sync problems from nightly run
1. The commit author is inferred from the hostname
2. There's no debug build present, so the update-manifest command exits immediately
3. The test run opens too many files and is killed
<!-- 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/19896)
<!-- Reviewable:end -->
-rwxr-xr-x | etc/ci/update-wpt-checkout | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index 6203d464191..574be72e716 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -15,6 +15,8 @@ BRANCH_NAME="wpt_update_${CURRENT_DATE}" export GIT_AUTHOR_NAME="WPT Sync Bot" export GIT_AUTHOR_EMAIL="josh+wptsync@joshmatthews.net" +export GIT_COMMITTER_NAME="${GIT_AUTHOR_NAME}" +export GIT_COMMITTER_EMAIL="${GIT_AUTHOR_EMAIL}" # Retrieve the HEAD commit and extract its hash function latest_git_commit() { @@ -39,7 +41,7 @@ function unsafe_pull_from_upstream() { fi # Update the manifest to include the new changes. - ./mach update-manifest || return 3 + ./mach update-manifest --release || return 3 # Amend the existing commit with the new changes from updating the manifest. git commit -a --amend --no-edit || return 4 @@ -57,7 +59,7 @@ function cleanup() { # Build Servo and run the full WPT testsuite, saving the results to a log file. function unsafe_run_tests() { # Run the full testsuite and record the new test results. - ./mach test-wpt --release --processes 24 --log-raw "${1}" \ + ./mach test-wpt --release --processes 12 --log-raw "${1}" \ --always-succeed || return 1 } |