From 2f8150f357402374ed05ed445d7996faffed40c0 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 18 May 2021 12:38:05 +1000
Subject: [PATCH] scmversion: Ignore play-store-release tag
---
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 aeb461288..bc2c42f63 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`) do (SET "TAG=%%g")
+FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest --exclude preview --exclude play-store-release`) 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 f4e9aa4a6..e47816fff 100755
--- a/src/scmversion/gen_scmversion.sh
+++ b/src/scmversion/gen_scmversion.sh
@@ -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 --exclude preview | tr -d '\r\n')
+TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude play-store-release | tr -d '\r\n')
DATE=$(git log -1 --date=iso8601-strict --format=%cd)
SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}"