From fd39f09aa70d81639a447f7e41e4f9ed3f2c10ca Mon Sep 17 00:00:00 2001 From: Connor McLaughlin <stenzek@gmail.com> Date: Fri, 25 Dec 2020 13:58:50 +1000 Subject: [PATCH] scmversion: Second part of beta -> preview --- appveyor.yml | 2 +- src/scmversion/gen_scmversion.bat | 2 +- src/scmversion/gen_scmversion.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 85045f701..13533a455 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ version: 1.0.{build} branches: only: - - master + - dev skip_tags: true image: diff --git a/src/scmversion/gen_scmversion.bat b/src/scmversion/gen_scmversion.bat index 6a5586e33..aeb461288 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 beta`) do (SET "TAG=%%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 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 6dabcea46..f4e9aa4a6 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 beta | tr -d '\r\n') +TAG=$(git describe --tags --dirty --exclude latest --exclude preview | tr -d '\r\n') DATE=$(git log -1 --date=iso8601-strict --format=%cd) SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}"