Disable master doc uploads

This commit is contained in:
Steven Fackler 2015-05-31 23:11:08 -07:00
parent 84ee63e2aa
commit 886f1d5913
3 changed files with 1 additions and 34 deletions

View File

@ -2,13 +2,10 @@ language: rust
rust: rust:
- nightly - nightly
- beta - beta
- stable
os: os:
- osx - osx
- linux - linux
env:
global:
- secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=
- FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npn"
before_install: before_install:
- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) - (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
before_script: before_script:
@ -16,6 +13,3 @@ before_script:
script: script:
- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) - (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test)
- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES")) - (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES"))
- ./.travis/build_docs.sh
after_success:
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test $TRAVIS_RUST_VERSION == "nightly" && ./.travis/update_docs.sh

View File

@ -1,11 +0,0 @@
#!/bin/bash
set -e
mkdir doc
for crate in $(echo openssl-sys openssl); do
mkdir -p $crate/target
(cd $crate/target && ln -s ../../doc)
(cd $crate && cargo doc --no-deps --features "$FEATURES")
done

View File

@ -1,16 +0,0 @@
#!/bin/bash
set -o errexit -o nounset
git clone --branch gh-pages "https://$GH_TOKEN@github.com/${TRAVIS_REPO_SLUG}.git" deploy_docs
cd deploy_docs
git config user.name "Steven Fackler"
git config user.email "sfackler@gmail.com"
rm -rf doc
mv ../doc .
git add -A .
git commit -m "rebuild pages at ${TRAVIS_COMMIT}"
git push