From e321c02b2531e72bd86fd922134a336150187bf9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Aug 2022 16:49:57 +0200 Subject: Fix branch detection for drone PRs Signed-off-by: Joas Schilling --- scripts/analysis/analysis-wrapper.sh | 3 ++- scripts/analysis/getBranchName.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 scripts/analysis/getBranchName.sh (limited to 'scripts') 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 -- cgit v1.2.3