Auto merge of #39574 - alexcrichton:beta-travis-doc, r=brson

[beta] travis: Really delete the `doc` folder This is a backport of #39415 so we can test out release infrastructure with Travis on beta.
rust-lang · Feb 9, 2017 · 3f38cac · 3f38cac
2 parents 7c4cb50 + 9ade95f
commit 3f38cac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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