Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Merge pull request #274 from lbryio/fix-rc-regex

Browse source 
remove - from regex for rc tag
This commit is contained in:
Job Evers‐Meltzer 2016-11-15 23:33:57 -06:00 • committed by GitHub
commit 3188165514
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/travis/setup_build.sh
View file

@ -20,14 +20,14 @@ set_build() {
mv -- tmpbuildfile "$file" 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 if [[ -z "$TRAVIS_TAG" ]]; then
python packaging/append_sha_to_version.py lbrynet/__init__.py "${TRAVIS_COMMIT}" python packaging/append_sha_to_version.py lbrynet/__init__.py "${TRAVIS_COMMIT}"
add_ui add_ui
set_build "qa" set_build "qa"
elif [[ "$TRAVIS_TAG" =~ $IS_RC_REGEX ]]; then 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 add_ui
set_build "rc" set_build "rc"
else else

3
packaging/windows/build.ps1
View file

@ -23,7 +23,8 @@ If (${Env:APPVEYOR_REPO_TAG} -NotMatch "true") {
AddUi AddUi
SetBuild "qa" 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 AddUi
SetBuild "rc" SetBuild "rc"
} }