From a6991b95164e9dee81a547c46e2efff74e4b9e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Fri, 29 Sep 2017 12:40:34 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Second=20attempt=20to=20push=20D?= =?UTF-8?q?ocker=20Images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index b75f9c3..0b3a323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,22 +17,13 @@ script: after_script: - docker-compose -f docker-compose.test.yml down -before_deploy: +after_success: - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" - -deploy: - - provider: script - script: build.sh master --push - on: - branch: master - - provider: script - script: build.sh develop-2.2 --push - on: - branch: master - - provider: script - script: build-latest.sh - on: - branch: master + - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then + build.sh master --push + build.sh develop-2.2 --push + build-latest.sh + fi notifications: slack: