From 2e8b6370cf6b257949acb6e06f6259d0756a22c9 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 24 Jul 2023 19:27:31 +1000 Subject: [PATCH] scmversion: Exclude previous-latest --- src/scmversion/gen_scmversion.bat | 2 +- src/scmversion/gen_scmversion.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scmversion/gen_scmversion.bat b/src/scmversion/gen_scmversion.bat index 265501d37..388cd0a80 100644 --- a/src/scmversion/gen_scmversion.bat +++ b/src/scmversion/gen_scmversion.bat @@ -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 --exclude preview --exclude legacy --exclude play-store-release`) do (SET "TAG=%%g") +FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest`) 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% diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh index 7a4862444..3d25e5ede 100755 --- a/src/scmversion/gen_scmversion.sh +++ b/src/scmversion/gen_scmversion.sh @@ -12,7 +12,7 @@ fi HASH=$(git rev-parse HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') -TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude play-store-release | tr -d '\r\n') +TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n') DATE=$(git log -1 --date=iso8601-strict --format=%cd) cd $CURDIR