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

Auto merge of #20273 - servo:jdm-patch-13, r=nox

Browse source 
Unbreak the docs build.

I added this to avoid the problem with doc builds leaving around large build artifacts while also working around #17243, but it appears to break the doc build entirely. This won't end up executing on servo-linux1 or servo-linux2 because of #17243, but I'm looking into the correct solution for that simultaneously.

<!-- 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/20273)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-12 13:26:55 -04:00 • committed by GitHub
commit af12284b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/ci/upload_docs.sh
View file

@ -38,9 +38,6 @@ cp apis.html ../../target/doc/servo/
echo "Copied apis.html." echo "Copied apis.html."
cd ../.. cd ../..
# Clean up the traces of the current doc build.
./etc/ci/clean_build_artifacts.sh
echo "Starting ghp-import." echo "Starting ghp-import."
ghp-import -n target/doc ghp-import -n target/doc
echo "Finished ghp-import." echo "Finished ghp-import."
@ -48,3 +45,6 @@ git push -qf \
"https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages \ "https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages \
&>/dev/null &>/dev/null
echo "Finished git push." echo "Finished git push."
# Clean up the traces of the current doc build.
./etc/ci/clean_build_artifacts.sh