c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated branch detection

Browse Source
This commit is contained in:
Peli de Halleux 2017-02-28 07:17:01 -08:00
parent 437ebb4fad
commit da72b09750
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins.sh
View File

@ -13,6 +13,7 @@ echo isPR: $1
originRegex="^origin/.*" originRegex="^origin/.*"
branchRegex="^origin/\K.*(?=$)" branchRegex="^origin/\K.*(?=$)"
releaseBranchRegex = "^(master|v\d+)$"
if [[ "$GIT_BRANCH" =~ $originRegex ]]; then if [[ "$GIT_BRANCH" =~ $originRegex ]]; then
branchName=$(echo ${GIT_BRANCH} | grep -oP $branchRegex) branchName=$(echo ${GIT_BRANCH} | grep -oP $branchRegex)
@ -27,7 +28,7 @@ if [ "$1" == "false" ]; then
echo Setting TRAVIS_PULL_REQUEST to false echo Setting TRAVIS_PULL_REQUEST to false
export TRAVIS_PULL_REQUEST=false export TRAVIS_PULL_REQUEST=false
if [ $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "v0" ]; then if [[ "$TRAVIS_BRANCH" =~ $releaseBranchRegex ]]; then
if [[ -z $PXT_RELEASE_REPO ]]; then if [[ -z $PXT_RELEASE_REPO ]]; then
echo Cannot find release repo; skipping tag checks echo Cannot find release repo; skipping tag checks
else else