Auto merge of #1115 - mattico:try-travis-doc-fixme, r=Diggsey

Re-enable doc uploading on travis rust-lang/rust#32532 is fixed, so this might work now. Let's find out.
rust-lang · May 18, 2017 · 07582cd · 07582cd
2 parents 5a2d8af + 6c58f1d
commit 07582cd
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/ci/prepare-deploy-travis.sh b/ci/prepare-deploy-travis.sh
@@ -12,15 +12,13 @@ fi
 
 # Upload docs
 if [[ "$TARGET" == "x86_64-unknown-linux-gnu" && "$TRAVIS_BRANCH" == "stable" ]]; then
-    # FIXME rust-lang/rust#32532
-    printf "not uploading docs"
-    #git config --global credential.helper store;
-    #echo "https://${TOKEN}:[email protected]" >> ~/.git-credentials;
-    #cargo doc --release;
-    #echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
-    #sudo pip install ghp-import;
-    #ghp-import -n target/doc;
-    #git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;
+    git config --global credential.helper store;
+    echo "https://${TOKEN}:[email protected]" >> ~/.git-credentials;
+    cargo doc --release;
+    echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
+    sudo pip install ghp-import;
+    ghp-import -n target/doc;
+    git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;
 fi;
 
 # Copy rustup-init to rustup-setup for backwards compatibility