From 025e6210079a8713e036c7684ef02f0cb900927d Mon Sep 17 00:00:00 2001 From: Chris Mills Date: Wed, 6 Nov 2019 19:41:34 +0000 Subject: [PATCH] Remove mention of Travis from deployment script (#1446) Signed-off-by: Chris M --- scripts/push-docker-images.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/scripts/push-docker-images.sh b/scripts/push-docker-images.sh index 4d7fd5c2..c43e3c28 100755 --- a/scripts/push-docker-images.sh +++ b/scripts/push-docker-images.sh @@ -4,19 +4,10 @@ set -xeuo pipefail REGISTRY=${REGISTRY:-gomods/} - -# Use the travis variables when available because travis clones different than what is on a local dev machine -# VERSION = the tag if present, otherwise the short commit hash -# BRANCH = the current branch, empty if not on a branch -if [[ "${TRAVIS-}" == "true" ]]; then - VERSION=${TRAVIS_TAG:-${TRAVIS_COMMIT::7}} - BRANCH=${TRAVIS_BRANCH} -else - TAG=$(git describe --tags --exact-match 2> /dev/null || true) - COMMIT=$(git rev-parse --short=7 HEAD) - VERSION=${VERSION:-${TAG:-${COMMIT}}} - BRANCH=${BRANCH:-$(git symbolic-ref -q --short HEAD || echo "")} -fi +TAG=$(git describe --tags --exact-match 2> /dev/null || true) +COMMIT=$(git rev-parse --short=7 HEAD) +VERSION=${VERSION:-${TAG:-${COMMIT}}} +BRANCH=${BRANCH:-$(git symbolic-ref -q --short HEAD || echo "")} # MUTABLE_TAG is the docker image tag that we will reuse between pushes, it is not an immutable tag like a commit hash or tag. if [[ "${MUTABLE_TAG:-}" == "" ]]; then