From 07edee471b582312f8dc31133f04ed796f9b8c74 Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Thu, 29 Aug 2019 18:12:25 -0400 Subject: [PATCH] Review feedback Signed-off-by: Nolan Brubaker --- .travis.yml | 22 +++++++++++----------- hack/gcr-push.sh | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2b9d2a2b..c26c6282a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,19 @@ services: - docker script: -- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) -- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH" -- hack/ci-check.sh + - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi) + - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH" + - hack/ci-check.sh # gcloud sdk is needed to upload docker images before_deploy: -- if [ ! -d ${HOME}/google-cloud-sdk ]; then curl https://sdk.cloud.google.com | bash - /dev/stdin --disable-prompts; fi + - if [ ! -d ${HOME}/google-cloud-sdk ]; then curl https://sdk.cloud.google.com | bash + /dev/stdin --disable-prompts; fi deploy: - -provider: script - skip_cleanup: true - script: hack/gcr-push.sh - on: - repo: heptio/velero - all_branches: true + - provider: script + skip_cleanup: true + script: hack/gcr-push.sh + on: + repo: heptio/velero + all_branches: true diff --git a/hack/gcr-push.sh b/hack/gcr-push.sh index 061e73164..dee580b11 100755 --- a/hack/gcr-push.sh +++ b/hack/gcr-push.sh @@ -49,4 +49,4 @@ openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_i gcloud auth activate-service-account --key-file heptio-images-fac92d2303ac.json unset GIT_HTTP_USER_AGENT -VERSION="$VERSION" TAG_LATEST="$TAG_LATEST" DOCKER="gcloud docker -- " make all-containers all-push +VERSION="$VERSION" TAG_LATEST="$TAG_LATEST" make all-containers all-push