From e321c02b2531e72bd86fd922134a336150187bf9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 9 Aug 2022 16:49:57 +0200
Subject: [PATCH 1/2] Fix branch detection for drone PRs

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml                           | 2 +-
 scripts/analysis/analysis-wrapper.sh | 3 ++-
 scripts/analysis/getBranchName.sh    | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 scripts/analysis/getBranchName.sh

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

From 6502f2c5ccffccb0e74e79380527f99e3dcfddd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey?= <alvaro.brey@nextcloud.com>
Date: Tue, 9 Aug 2022 17:23:51 +0200
Subject: [PATCH 2/2] Bump spotbugs-results to 141
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
---
 scripts/analysis/findbugs-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt
index c2807f7f3..b4f334f26 100644
--- a/scripts/analysis/findbugs-results.txt
+++ b/scripts/analysis/findbugs-results.txt
@@ -1 +1 @@
-140
\ No newline at end of file
+141