From cf5a32130493c3e31d6a77ced498c0046e5ed4cd Mon Sep 17 00:00:00 2001 From: Steve Chan Date: Fri, 6 Jul 2018 14:55:16 -0700 Subject: [PATCH] Have travis build and push the staging branch as well --- .travis.yml | 2 +- scripts/push2dockerhub.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0f359b770..356c59bfa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ branches: - develop - master - travis-firefox - - dockerize + - staging before_install: - pip install virtualenv coveralls diff --git a/scripts/push2dockerhub.sh b/scripts/push2dockerhub.sh index 08f331d6d6..93b01552fc 100755 --- a/scripts/push2dockerhub.sh +++ b/scripts/push2dockerhub.sh @@ -19,7 +19,7 @@ COMMIT=`git rev-parse --short HEAD` if ( [ "$TRAVIS_SECURE_ENV_VARS" == "true" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] ); then # $TAG was set from TRAVIS_BRANCH, which is a little wonky on pull requests, # but it should be okay since we should never get here on a PR - if ( [ "$TAG" == "latest" ] || [ "$TAG" == "develop" ] || [ "$TAG" == "dockerize" ] ) ; then + if ( [ "$TAG" == "latest" ] || [ "$TAG" == "develop" ] || [ "$TAG" == "staging" ] ) ; then echo "Logging into Dockerhub as $DOCKER_USER" docker login -u $DOCKER_USER -p $DOCKER_PASS && \ docker tag $IMAGE_NAME:$COMMIT $IMAGE_NAME:$TAG && \