Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20024 - servo:jdm-patch-17, r=emilio

Browse source 
Propagate error code from fetching WPT changes.

http://build.servo.org/builders/mac-nightly/builds/606 shows a completely error-free run, despite encountering an error early on in `./etc/ci/update-wpt-checkout fetch-and-update-expectations`. We were swallowing the nonzero error code in this case.

<!-- 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/20024)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-02-12 10:02:01 -05:00 • committed by GitHub
commit 66141e95bb
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

@ -116,7 +116,7 @@ EOF
curl -H "Authorization: token ${WPT_SYNC_TOKEN}" \ curl -H "Authorization: token ${WPT_SYNC_TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
--data @prdata.json \ --data @prdata.json \
https://api.github.com/repos/servo/servo/pulls || return 4 https://api.github.com/repos/servo/servo/pulls || return 5
} }
function pull_from_upstream() { function pull_from_upstream() {
@ -164,6 +164,8 @@ function main() {
if [[ "${code}" == "255" ]]; then if [[ "${code}" == "255" ]]; then
echo "No changes to sync." echo "No changes to sync."
return 0 return 0
elif [[ "${code}" != "" ]]; then
return "${code}"
fi fi
fi fi