forked from srbala/fedora-kickstarts
Fix to work with multiple tags
If there are multiple tags pointing to HEAD we need to pick only one. We'll take one that seems to be a version number. This allows the version number tag to coexist with another tag, that perhaps indicates which images it was used to build.
This commit is contained in:
parent
247595b762
commit
0ecefe0230
2
Makefile
2
Makefile
@ -1,5 +1,5 @@
|
|||||||
# Get the version name first by seeing if HEAD is tagged
|
# Get the version name first by seeing if HEAD is tagged
|
||||||
version := $(shell git tag --points-at HEAD)
|
version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
|
||||||
# And if it wasn't use a git hash
|
# And if it wasn't use a git hash
|
||||||
ifeq ($(version),)
|
ifeq ($(version),)
|
||||||
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
|
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
|
||||||
|
Loading…
Reference in New Issue
Block a user