servo: Merge #17244 - Copy all geckolib dependency docs for upload (from servo:jdm-patch-3); r=emilio
authorJosh Matthews <josh@joshmatthews.net>
Sat, 10 Jun 2017 18:03:30 -0700
changeset 411484 7996b68e8a642f16633e3f6ec07e2473ed895608
parent 411483 68f9a27cdf3bc31652a3c33dab3110af348b5b2f
child 411485 ad5856c55a94eac582cdef6347bacabb9e6285f7
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17244 - Copy all geckolib dependency docs for upload (from servo:jdm-patch-3); r=emilio Attempt to fix the doc uploading process which is permafailing in #17243. Source-Repo: https://github.com/servo/servo Source-Revision: ab77d03c3bb6466eb55af5f445cdc805f6a05847
servo/etc/ci/upload_docs.sh
--- a/servo/etc/ci/upload_docs.sh
+++ b/servo/etc/ci/upload_docs.sh
@@ -15,17 +15,19 @@ set -o pipefail
 cd "$(dirname ${0})/../.."
 
 ./mach doc
 # etc/doc.servo.org/index.html overwrites $(mach rust-root)/doc/index.html
 cp etc/doc.servo.org/* target/doc/
 
 ./mach cargo-geckolib doc
 mkdir target/doc/geckolib
-cp target/geckolib/doc/* target/doc/geckolib/
+# Use recursive copy here to avoid `cp` returning an error code
+# when it encounters directories.
+cp -r target/geckolib/doc/* target/doc/geckolib/
 
 python components/style/properties/build.py servo html regular
 
 cd components/script
 cmake .
 cmake --build . --target supported-apis
 cp apis.html ../../target/doc/servo/
 cd ../..