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

Commit

Permalink
build tooling: Allow custom tags to exist
Browse files Browse the repository at this point in the history
Otherwise other tags confuse the version script.

Equivalent to kubernetes/kubernetes#83497
  • Loading branch information
justinsb committed Dec 16, 2020
1 parent 52d817d commit edcf198
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ kube::version::get_version_vars() {
fi

# Use git describe to find the version based on tags.
if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$("${git[@]}" describe --tags --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then
if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$("${git[@]}" describe --tags --match='v*' --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then
# This translates the "git describe" to an actual semver.org
# compatible semantic version that looks something like this:
# v1.1.0-alpha.0.6+84c76d1142ea4d
Expand Down

0 comments on commit edcf198

Please sign in to comment.