Skip to content

Commit

Permalink
updated travis/makefile for 1.2.11
Browse files Browse the repository at this point in the history
Signed-off-by: kesavan thiruvenkadasamy <[email protected]>
  • Loading branch information
px-kesavan committed Dec 7, 2023
1 parent e8a1e0c commit ec056dc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ script:
if [ -n "${TRAVIS_TAG}" ]; then
export RELEASE_VER=${TRAVIS_TAG}
elif [ "${TRAVIS_BRANCH}" == "master" ]; then
export DOCKER_IMAGE_TAG=master-latest
export DOCKER_IMAGE_TAG=1.2.11
else
export RELEASE_VER=`git rev-parse --short HEAD`
fi
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RELEASE_VER ?= master-latest
RELEASE_VER ?= 1.2.11
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)
Expand All @@ -11,7 +11,7 @@ DOCKER_IMAGE_NAME?=kdmp
DOCKER_IMAGE_TAG?=$(RELEASE_VER)

DOCKER_KDMP_UNITTEST_IMAGE?=px-kdmp-unittest
DOCKER_KDMP_TAG?=master-latest
DOCKER_KDMP_TAG?=1.2.11

DOCKER_IMAGE=$(DOCKER_IMAGE_REPO)/$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)
KDMP_UNITTEST_IMG=$(DOCKER_IMAGE_REPO)/$(DOCKER_KDMP_UNITTEST_IMAGE):$(DOCKER_KDMP_TAG)
Expand All @@ -30,7 +30,7 @@ export GOFLAGS = -mod=vendor

MAJOR_VERSION := 1
MINOR_VERSION := 2
PATCH_VERSION := 6
PATCH_VERSION := 11

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')
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
//
// These variables typically come from -ldflags settings.
var (
gitVersion = "master-latest"
gitVersion = "1.2.11"
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+)(.*)`)
Expand Down

0 comments on commit ec056dc

Please sign in to comment.