diff options
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rwxr-xr-x | scripts/analysis/analysis-wrapper.sh | 3 | ||||
| -rw-r--r-- | scripts/analysis/getBranchName.sh | 9 |
3 files changed, 12 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml index e34bf032f..559e40412 100644 --- a/.drone.yml +++ b/.drone.yml @@ -94,7 +94,7 @@ steps: LOG_PASSWORD: from_secret: LOG_PASSWORD commands: - - export BRANCH=$(git branch | grep '*' | cut -d' ' -f2) + - export BRANCH=$(scripts/analysis/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST) - scripts/analysis/analysis-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST - name: notify diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 5dde79b43..1720ba4f0 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -11,7 +11,8 @@ repository="talk" -if [[ $3 = \stable-* ]] ; then +stableBranch=$(git branch | grep '*' | cut -d' ' -f2) +if [[ $stableBranch = \stable-* ]] ; then stableBranch=$3 else stableBranch="master" diff --git a/scripts/analysis/getBranchName.sh b/scripts/analysis/getBranchName.sh new file mode 100644 index 000000000..300f864a5 --- /dev/null +++ b/scripts/analysis/getBranchName.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# $1: username, $2: password/token, $3: pull request number + +if [ -z $3 ] ; then + git branch | grep '*' | cut -d' ' -f2 +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 |