Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated travis to reflect master branch changes #340

Merged
merged 1 commit into from
Feb 5, 2024
Merged

Updated travis to reflect master branch changes #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
View file
Open in desktop
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 = "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+)(.*)`)
Expand Down
Loading