Merge branch 'version-file'
This commit is contained in:
commit
26c099a50a
3 changed files with 9 additions and 2 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -1 +1,2 @@
|
|||
frontend/* linguist-vendored
|
||||
VERSION export-subst
|
||||
|
|
8
Makefile
8
Makefile
|
@ -1,5 +1,9 @@
|
|||
LAST_COMMIT := $(shell git rev-parse --short HEAD)
|
||||
VERSION := $(shell git describe --tags --abbrev=0)
|
||||
# Try to get the commit hash from 1) git 2) the VERSION file 3) fallback.
|
||||
LAST_COMMIT := $(or $(shell git rev-parse --short HEAD 2> /dev/null),$(shell head -n 1 VERSION | grep -oP -m 1 "^[a-z0-9]+$$"),"UNKNOWN")
|
||||
|
||||
# Try to get the semver from 1) git 2) the VERSION file 3) fallbakc.
|
||||
VERSION := $(or $(shell git describe --tags --abbrev=0 2> /dev/null),$(shell grep -oP "tag: \K(.*)(?=,)" VERSION),"v0.0.0")
|
||||
|
||||
BUILDSTR := ${VERSION} (\#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
|
||||
|
||||
YARN ?= yarn
|
||||
|
|
2
VERSION
Normal file
2
VERSION
Normal file
|
@ -0,0 +1,2 @@
|
|||
$Format:%h$
|
||||
$Format:%D$
|
Loading…
Reference in a new issue