Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

fix(build): ensure controller version is not a chart version #1927

Merged
merged 1 commit into from
Oct 27, 2020
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GOBIN = $(GOPATH)/bin
GOX = go run github.com/mitchellh/gox

CLI_VERSION ?= dev
CONTROLLER_VERSION = $$(git describe --abbrev=0 --tags)
CONTROLLER_VERSION = $$(git describe --abbrev=0 --tags --match "v*")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to drop a comment regarding the match.

BUILD_DATE=$$(date +%Y-%m-%d-%H:%M)
GIT_SHA=$$(git rev-parse HEAD)
BUILD_DATE_VAR := github.com/openservicemesh/osm/pkg/version.BuildDate
Expand Down