mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 02:09:56 +00:00
Merge pull request #1122 from filbranden/version_major_minor1
Push major and minor versions from git
This commit is contained in:
commit
1210018b6e
@ -47,7 +47,28 @@ kube::version_ldflags() {
|
|||||||
|
|
||||||
# Use git describe to find the version based on annotated tags.
|
# Use git describe to find the version based on annotated tags.
|
||||||
if git_version=$(git describe --abbrev=14 "${git_commit}^{commit}" 2>/dev/null); then
|
if git_version=$(git describe --abbrev=14 "${git_commit}^{commit}" 2>/dev/null); then
|
||||||
|
if [[ "${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,
|
||||||
|
# so use our idea of "dirty" from git status instead.
|
||||||
|
git_version+="-dirty"
|
||||||
|
fi
|
||||||
ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitVersion" "${git_version}")
|
ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitVersion" "${git_version}")
|
||||||
|
|
||||||
|
# Try to match the "git describe" output to a regex to try to extract
|
||||||
|
# the "major" and "minor" versions and whether this is the exact tagged
|
||||||
|
# version or whether the tree is between two tagged versions.
|
||||||
|
if [[ "${git_version}" =~ ^v([0-9]+)\.([0-9]+)([.-].*)?$ ]]; then
|
||||||
|
git_major=${BASH_REMATCH[1]}
|
||||||
|
git_minor=${BASH_REMATCH[2]}
|
||||||
|
if [[ -n "${BASH_REMATCH[3]}" ]]; then
|
||||||
|
git_minor+="+"
|
||||||
|
fi
|
||||||
|
ldflags+=(
|
||||||
|
-X "${KUBE_GO_PACKAGE}/pkg/version.gitMajor" "${git_major}"
|
||||||
|
-X "${KUBE_GO_PACKAGE}/pkg/version.gitMinor" "${git_minor}"
|
||||||
|
)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user