Update travis file (#37)

Signed-off-by: Serhii Aheienko <serhii.aheienko@gmail.com>
portworx · Feb 24, 2021 · 458c103 · 458c103
1 parent 00f286a
commit 458c103
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,12 @@ go:
   - 1.13.7
 script:
   - |
-    if [ "${TRAVIS_BRANCH}" == "master" ]; then
+    if [ -n "${TRAVIS_TAG}" ]; then
+      export RELEASE_VER=${TRAVIS_TAG}
+    elif [ "${TRAVIS_BRANCH}" == "master" ]; then
       export DOCKER_IMAGE_TAG=master
     else
-      export DOCKER_IMAGE_TAG=`git rev-parse --short HEAD`
+      export RELEASE_VER=`git rev-parse --short HEAD`
     fi
     make all &&
     if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then

diff --git a/Makefile b/Makefile
@@ -1,9 +1,8 @@
-RELEASE_VER := latest
+RELEASE_VER ?= latest
 BUILD_DATE  := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 BASE_DIR    := $(shell git rev-parse --show-toplevel)
 GIT_SHA     := $(shell git rev-parse --short HEAD)
 BIN         := $(BASE_DIR)/bin
-export RELEASE_VER
 
 DOCKER_IMAGE_REPO?=portworx
 DOCKER_IMAGE_NAME?=kdmp