From 1c036cce7849ee847d8dd511a92e42bed4be6b8c Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Tue, 15 Nov 2016 22:01:20 -0600 Subject: [PATCH] remove - from regex for rc tag --- packaging/travis/setup_build.sh | 4 ++-- packaging/windows/build.ps1 | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/travis/setup_build.sh b/packaging/travis/setup_build.sh index 311dd57ec..94055a373 100755 --- a/packaging/travis/setup_build.sh +++ b/packaging/travis/setup_build.sh @@ -20,14 +20,14 @@ set_build() { mv -- tmpbuildfile "$file" } -IS_RC_REGEX="v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+-rc[[:digit:]]+" +IS_RC_REGEX="v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+rc[[:digit:]]+" if [[ -z "$TRAVIS_TAG" ]]; then python packaging/append_sha_to_version.py lbrynet/__init__.py "${TRAVIS_COMMIT}" add_ui set_build "qa" elif [[ "$TRAVIS_TAG" =~ $IS_RC_REGEX ]]; then - # If the tag looks like v0.7.6-rc0 then this is a tagged release candidate. + # If the tag looks like v0.7.6rc0 then this is a tagged release candidate. add_ui set_build "rc" else diff --git a/packaging/windows/build.ps1 b/packaging/windows/build.ps1 index 78a058b12..25218e341 100644 --- a/packaging/windows/build.ps1 +++ b/packaging/windows/build.ps1 @@ -23,7 +23,8 @@ If (${Env:APPVEYOR_REPO_TAG} -NotMatch "true") { AddUi SetBuild "qa" } -ElseIf (${Env:APPVEYOR_REPO_TAG_NAME} -Match "v\d+\.\d+\.\d+-rc\d+") { +ElseIf (${Env:APPVEYOR_REPO_TAG_NAME} -Match "v\d+\.\d+\.\d+rc\d+") { + # If the tag looks like v0.7.6rc0 then this is a tagged release candidate. AddUi SetBuild "rc" }