only run deploy script on master branch

nihlaeth · Feb 26, 2017 · c6047d4 · c6047d4
1 parent 1b28f9d
commit c6047d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ after_success:
 - echo $PATH
 - which bash
 - which python
-- test "${TRAVIS_PULL_REQUEST}" == "false" && sh ./scripts/pypi_deploy.sh
+- test "${TRAVIS_PULL_REQUEST}" == "false" && test "${TRAVIS_BRANCH}" == "master" && test "${TRAVIS_PYTHON_VERSION}" == "3.6" && sh ./scripts/pypi_deploy.sh
 env:
   global:
   - TWINE_USERNAME=nihlaeth

diff --git a/scripts/pypi_deploy.sh b/scripts/pypi_deploy.sh
@@ -18,9 +18,8 @@ repository = https://upload.pypi.org/legacy/
 username = ${TWINE_USERNAME}
 password = ${TWINE_PASSWORD}
 _EOF_
-if [ "${TRAVIS_PYTHON_VERSION}" = "3.6" ]; then
-    $(which twine) upload -r testpypi --skip-existing dist/*
-    if [ "${TRAVIS_TAG}" != "" ]; then
-        $(which twine) upload -r pypi --skip-existing dist/*
-    fi
+$(which twine) upload -r testpypi --skip-existing dist/*
+if [ "${TRAVIS_TAG}" != "" ]; then
+    $(which twine) upload -r pypi --skip-existing dist/*
 fi
+set +v