diff --git a/.drone.yml b/.drone.yml index 5fc475220..e34bf032f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,7 @@ steps: trigger: branch: - master + - stable-* event: - pull_request - push @@ -29,6 +30,7 @@ steps: trigger: branch: - master + - stable-* event: - push - pull_request @@ -69,6 +71,7 @@ services: trigger: branch: - master + - stable-* event: - push - pull_request @@ -91,7 +94,7 @@ steps: LOG_PASSWORD: from_secret: LOG_PASSWORD commands: - - export BRANCH=$(scripts/analysis/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST) + - export BRANCH=$(git branch | grep '*' | cut -d' ' -f2) - scripts/analysis/analysis-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST - name: notify @@ -124,6 +127,7 @@ steps: trigger: branch: - master + - stable-* event: - push - pull_request diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 53ac32447..5dde79b43 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -8,9 +8,15 @@ #6: DRONE_BUILD_NUMBER #7: PULL_REQUEST_NUMBER -stableBranch="master" + repository="talk" +if [[ $3 = \stable-* ]] ; then + stableBranch=$3 +else + stableBranch="master" +fi + ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? diff --git a/scripts/analysis/getBranchName.sh b/scripts/analysis/getBranchName.sh deleted file mode 100755 index 7b91215c5..000000000 --- a/scripts/analysis/getBranchName.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# $1: username, $2: password/token, $3: pull request number - -if [ -z $3 ] ; then - echo "master"; -else - curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/talk-android/pulls/$3 | grep \"ref\": | grep -v master | cut -d"\"" -f4 -fi