From 525dc6a2d058cd1126cbcf223239164e53498a49 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 10 May 2021 17:45:23 +0100 Subject: [PATCH] Only attempt to login to docker on main --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab3854078..c76db46b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ jdk: oraclejdk8 services: - docker before_script: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "main" ] && docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"' + - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || [ "${TRAVIS_BRANCH}" != "main" ] || docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"' script: - - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic + - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && ([ "${TRAVIS_BRANCH}" != "main" ] || docker push springio/petclinic)