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

Commit

Permalink
fix(build): ensure controller version is not a chart version (#1927)
Browse files Browse the repository at this point in the history
Currently, we make tags of the form `v.X.Y.Z` for binary releases and
`chart/X.Y.Z` for the Helm chart. The version is passed to the
osm-controller binary via a linker flag. If both a chart and regular
semver tag exist on the same commit, the chart tag may be passed instead
of the regular version tag. This change ensures only our regular semver
tags are used for the versions embedded in the binaries.
  • Loading branch information
nojnhuh authored Oct 27, 2020
1 parent 7df16e9 commit fa0445c
Showing 1 changed file with 1 addition and 1 deletion.
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*")
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

0 comments on commit fa0445c

Please sign in to comment.