From c8c3500be9cbb5f868854ce0698193f4b3518044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Fri, 24 Jun 2022 13:57:32 +0200
Subject: [PATCH 1/3] Replave 'getBranchName.sh' with Git command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .drone.yml                        | 2 +-
 scripts/analysis/getBranchName.sh | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100755 scripts/analysis/getBranchName.sh

diff --git a/.drone.yml b/.drone.yml
index 5fc475220..fb07e77ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -91,7 +91,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
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

From 7a6fa9a4444e593064d3e8379a699328cdcfaafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Fri, 24 Jun 2022 14:19:46 +0200
Subject: [PATCH 2/3] Add stable branches as trigger for Drone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .drone.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index fb07e77ba..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
@@ -124,6 +127,7 @@ steps:
 trigger:
   branch:
     - master
+    - stable-*
   event:
     - push
     - pull_request

From 050fb81a32d078d6b3e55b5e64c62092f6bf7027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Fri, 24 Jun 2022 14:37:21 +0200
Subject: [PATCH 3/3] Detect stable branches on the fly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Stable branches are 'master' or 'stable-*'.

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 scripts/analysis/analysis-wrapper.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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=$?