diff --git a/.travis.yml b/.travis.yml index 61063b6f..f91f5f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ addons: env: global: - GH_REF: github.com/scikit-image/docs.git - - secure: "k646ELF4CfE/S5F1dVeAn8XXdqqWdrHNgTOlZhW9BiC+nLiHU8ADlh+hKlibUWXuT0e1mv9utEkRNwj+MLZ3nSnqXoyLzQaRR2Nd8ldaclhQOIi0QOcsae9oFtCfsFosF40tjEXEmXsh2W81g557y81yEzk7RjE4PpWNnPJe8qM=" + - secure: "K6GorAy3f0SFJ/x3rP0umbbxsM280W0jNwxYN2NrSWtvhiqXK4t4WrGH3n0ztC95rbqtskgr4y/f9aAi+3F9MScjZj4qViMrcFFuUgHxR5R+i4wKfwmvZd/vTBwYNawOK/dPxkCN9tRCE/R2tgBWDTJk1kMeOYvVAzye6TYcmq4=" notifications: webhooks: diff --git a/tools/deploy_docs.sh b/tools/deploy_docs.sh index c25c0c1e..127a3831 100644 --- a/tools/deploy_docs.sh +++ b/tools/deploy_docs.sh @@ -1,5 +1,6 @@ #!/bin/bash -if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PYTHON_VERSION == 3.4 ]] +if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && + $TRAVIS_PYTHON_VERSION == 3.4 ]] then # See https://help.github.com/articles/creating-an-access-token-for-command-line-use/ for how to generate a token # See http://docs.travis-ci.com/user/encryption-keys/ for how to generate @@ -17,7 +18,7 @@ then git add dev git commit -m "Deployed to GitHub Pages" - git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages + git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1 ) else echo "-- will only push docs from master --"