From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 8 Nov 2016 15:07:49 +0000 (-0800)
Subject: Don't use travis-cargo to upload docs
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~8^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc15ca5d202d6d10f6be45f388759a902723de6c;p=cargo.git

Don't use travis-cargo to upload docs
---

diff --git a/.travis.yml b/.travis.yml
index be844a9c8..2bbcbe98a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,7 +98,6 @@ matrix:
     - rust: stable
 
 before_script:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
   - curl https://static.rust-lang.org/rustup.sh |
     sh -s -- --add-target=$TARGET --disable-sudo -y --prefix=`rustc --print sysroot`
   - if [ ! -z "$ALT" ]; then
@@ -111,8 +110,13 @@ script:
     else
         src/ci/docker/run.sh $IMAGE $TARGET;
     fi
-after_success:
-  - travis-cargo --only nightly doc-upload
+after_success: |
+  [ $TRAVIS_BRANCH = master ] &&
+  [ $TRAVIS_PULL_REQUEST = false ] &&
+  [ $(uname -s) = Linux ] &&
+  pip install ghp-import --user $USER &&
+  $HOME/.local/bin/ghp-import -n target/doc &&
+  git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
 
 env:
   global: