diff --git a/.travis.yml b/.travis.yml index a8f791689..62d89181f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ script: - | if [ -n "${TRAVIS_TAG}" ]; then export RELEASE_VER=${TRAVIS_TAG} - elif [ "${TRAVIS_BRANCH}" == "1.2.11" ]; then - export DOCKER_IMAGE_TAG=1.2.11 + elif [ "${TRAVIS_BRANCH}" == "master" ]; then + export DOCKER_IMAGE_TAG=master-latest else export RELEASE_VER=`git rev-parse --short HEAD` fi diff --git a/Makefile b/Makefile index 5a5480ebb..5642625d9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -RELEASE_VER ?= 1.2.11 +RELEASE_VER ?= master-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) @@ -30,7 +30,7 @@ export GOFLAGS = -mod=vendor MAJOR_VERSION := 1 MINOR_VERSION := 2 -PATCH_VERSION := 11 +PATCH_VERSION := 6 ifndef PKGS PKGS := $(shell GOFLAGS=-mod=vendor go list ./... 2>&1 | grep -v 'go: ' | grep -v 'github.com/portworx/kdmp/vendor' | grep -v versioned | grep -v 'pkg/apis/v1') diff --git a/pkg/version/version.go b/pkg/version/version.go index 36196c553..b905af09c 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -24,7 +24,7 @@ const ( // // These variables typically come from -ldflags settings. var ( - gitVersion = "1.2.11" + gitVersion = "master-latest" gitCommit = "" // sha1 from git, output of $(git rev-parse HEAD) buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ') kbVerRegex = regexp.MustCompile(`^(v\d+\.\d+\.\d+)(.*)`)