From 3d4d2336a95e493ac3d586b7a5dc5cf1eb8b192d Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Fri, 18 Nov 2022 17:48:43 +1000 Subject: [PATCH] scmversion: Filter legacy tag --- src/scmversion/gen_scmversion.bat | 2 +- src/scmversion/gen_scmversion.sh | 2 +- src/scmversion/update_rc_version.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scmversion/gen_scmversion.bat b/src/scmversion/gen_scmversion.bat index bc2c42f63..265501d37 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 play-store-release`) do (SET "TAG=%%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 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 fd013a82b..7a4862444 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 play-store-release | tr -d '\r\n') +TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude play-store-release | tr -d '\r\n') DATE=$(git log -1 --date=iso8601-strict --format=%cd) cd $CURDIR diff --git a/src/scmversion/update_rc_version.bat b/src/scmversion/update_rc_version.bat index 76aa528eb..3a1099f2d 100644 --- a/src/scmversion/update_rc_version.bat +++ b/src/scmversion/update_rc_version.bat @@ -1,6 +1,6 @@ @echo off -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 describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude play-store-release`) do (SET "TAG=%%g") powershell -Command "(gc ..\duckstation-qt\duckstation-qt.rc) -replace '1,0,0,1', '"%TAG:~0,1%","%TAG:~2,1%","%TAG:~4,4%",0' | Out-File -encoding ASCII ..\duckstation-qt\duckstation-qt.rc" powershell -Command "(gc ..\duckstation-qt\duckstation-qt.rc) -replace '1.0.0.1', '"%TAG:~0,1%"."%TAG:~2,1%"."%TAG:~4,4%"' | Out-File -encoding ASCII ..\duckstation-qt\duckstation-qt.rc"