From e296b6023ec6b02747943a9c3e1a5935e1f2e705 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 18 Feb 2021 15:16:48 -0500 Subject: Fix incorrect version number output Signed-off-by: Chris Evich --- hack/get_release_info.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hack/get_release_info.sh b/hack/get_release_info.sh index 69cf8cd57..40c473246 100755 --- a/hack/get_release_info.sh +++ b/hack/get_release_info.sh @@ -14,11 +14,19 @@ valid_args() { cut -d '*' -f 1 } +# `git describe` does not reliably produce a useful version number. +scrape_version() { + local versionfile='version/version.go' + local version_line=$(grep -m 1 'var Version =' $versionfile) + local version_string=$(cut -d '"' -f 2 <<<"$version_line") + echo "$version_string" | tr -d '[:space:]' +} + unset OUTPUT case "$1" in # Wild-card suffix needed by valid_args() e.g. possible bad grep of "$(echo $FOO)" VERSION*) - OUTPUT="${CIRRUS_TAG:-$(git fetch --tags && git describe HEAD 2> /dev/null)}" + OUTPUT="${CIRRUS_TAG:-$(scrape_version)}" ;; NUMBER*) OUTPUT="$($0 VERSION | sed 's/-.*//')" -- cgit v1.2.3-54-g00ecf