Merge pull request #2282 from nextcloud/bugfix/2165/fix-branch-detection-with-drone-prs

Fix branch detection for drone PRs

.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

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"

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-140
+141

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