about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-03 09:13:06 +0000
committerbors <bors@rust-lang.org>2017-02-03 09:13:06 +0000
commitf45992b3008eea7152434c41097fb28d9cfaf2c0 (patch)
tree1b7793b067e1f34449ccb78ae2a6bdf76da32a44
parent57ecd7aa4bc8dfd07fb0888479b25e53daf46140 (diff)
parent775b32305f8ec9ed18d6cc8ff13bd8af8f4be14a (diff)
Auto merge of #39415 - alexcrichton:fix-upload-dirs, r=brson
travis: Really delete the `doc` folder

Got two location to look at, be sure to delete them both.
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f138b0bed2b..ea405413e78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,11 +109,12 @@ cache:
 
 before_deploy:
   - mkdir -p deploy/$TRAVIS_COMMIT
-  - rm -rf build/dist/doc
   - >
       if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+          rm -rf build/dist/doc &&
           cp -r build/dist/* deploy/$TRAVIS_COMMIT;
       else
+          rm -rf obj/build/dist/doc &&
           cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
       fi