From 25185f8f1fb341188c632620d44a9f3873909632 Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Tue, 1 Jan 2019 12:39:16 -0800 Subject: [PATCH] travis.yml: Make script into individual lines Setting -eu fucks up travis's scripts, so instead we should feed it everything command-by-command so it can fail out using its own logic. --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bb6ba0..0e93bda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,12 @@ services: - docker # what to actually run -script: | - set -eu - export PUSH=true # always push - # if this is a push to master build, also push latest - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then - export PUSH=latest - fi - # log into quay.io so we can push - echo "$QUAY_PASSWORD" | docker login quay.io -u "$QUAY_USER" --password-stdin - # build and push all components - ./build +script: +# always push +- export PUSH=true +# if this is a push to master build, also push latest +- if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then export PUSH=latest; fi +# log into quay.io so we can push +- echo "$QUAY_PASSWORD" | docker login quay.io -u "$QUAY_USER" --password-stdin +# build and push all components +- ./build