Skip to content

K
k3s
Commit cb027ce2 authored by Joe Beda's avatar Joe Beda
Browse files
Options

Look at all tags when looking for version.

'git describe' uses only annotated tags by default. We want to use all tags as we can only create 'lightweight' tags in the GitHub UI.
parent 67fec225
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/config-go.sh
View file @ cb027ce2
......@@ -78,7 +78,7 @@ kube::version_ldflags() {
ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitTreeState" "${KUBE_GIT_TREE_STATE}")
# Use git describe to find the version based on annotated tags.
if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$(git describe --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then
if [[ -n ${KUBE_GIT_VERSION-} ]] || KUBE_GIT_VERSION=$(git describe --tag --abbrev=14 "${KUBE_GIT_COMMIT}^{commit}" 2>/dev/null); then
if [[ "${KUBE_GIT_TREE_STATE}" == "dirty" ]]; then
# git describe --dirty only considers changes to existing files, but
# that is problematic since new untracked .go files affect the build,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment