diff options
| author | Steven Fackler <[email protected]> | 2015-05-31 23:11:08 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-05-31 23:11:25 -0700 |
| commit | 886f1d59130feeb0fa19d3bbd24036f7f83bc222 (patch) | |
| tree | c484c0a85df25816e991bfeb6aa3d28a76bb5418 | |
| parent | Merge pull request #222 from cheme/master (diff) | |
| download | rust-openssl-886f1d59130feeb0fa19d3bbd24036f7f83bc222.tar.xz rust-openssl-886f1d59130feeb0fa19d3bbd24036f7f83bc222.zip | |
Disable master doc uploads
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | .travis/build_docs.sh | 11 | ||||
| -rwxr-xr-x | .travis/update_docs.sh | 16 |
3 files changed, 1 insertions, 34 deletions
diff --git a/.travis.yml b/.travis.yml index b302c491..e8bf79e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,10 @@ language: rust rust: - nightly - beta +- stable os: - osx - linux -env: - global: - - secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg= - - FEATURES="tlsv1_1 tlsv1_2 dtlsv1 aes_xts npn" before_install: - (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh) before_script: @@ -16,6 +13,3 @@ before_script: script: - (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")) -- ./.travis/build_docs.sh -after_success: -- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test $TRAVIS_RUST_VERSION == "nightly" && ./.travis/update_docs.sh diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh deleted file mode 100755 index 5ce9ed30..00000000 --- a/.travis/build_docs.sh +++ /dev/null @@ -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 diff --git a/.travis/update_docs.sh b/.travis/update_docs.sh deleted file mode 100755 index 355f75f8..00000000 --- a/.travis/update_docs.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -o errexit -o nounset - -git clone --branch gh-pages "https://[email protected]/${TRAVIS_REPO_SLUG}.git" deploy_docs -cd deploy_docs - -git config user.name "Steven Fackler" -git config user.email "[email protected]" - -rm -rf doc -mv ../doc . - -git add -A . -git commit -m "rebuild pages at ${TRAVIS_COMMIT}" -git push |