scmversion: Fix incorrect tagging after stable/beta split
This commit is contained in:
parent
3ab017c32e
commit
14c227a813
|
@ -3,7 +3,7 @@
|
|||
SET VERSIONFILE="scmversion.cpp"
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse HEAD`) do (SET "HASH=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse --abbrev-ref HEAD`) do (SET "BRANCH=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest`) do (SET "TAG=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude beta`) do (SET "TAG=%%g")
|
||||
FOR /F "tokens=* USEBACKQ" %%g IN (`git log -1 --date=iso8601-strict "--format=%%cd"`) do (SET "CDATE=%%g")
|
||||
|
||||
SET SIGNATURELINE=// %HASH% %BRANCH% %TAG% %CDATE%
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
VERSION_FILE="scmversion.cpp"
|
||||
HASH=$(git rev-parse HEAD)
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
|
||||
TAG=$(git describe --tags --dirty --exclude latest | tr -d '\r\n')
|
||||
TAG=$(git describe --tags --dirty --exclude latest --exclude beta | tr -d '\r\n')
|
||||
DATE=$(git log -1 --date=iso8601-strict --format=%cd)
|
||||
|
||||
SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}"
|
||||
|
|
Loading…
Reference in New Issue