diff options
| author | Joas Schilling <coding@schilljs.com> | 2022-08-09 17:49:57 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2022-08-09 17:49:57 +0300 |
| commit | e321c02b2531e72bd86fd922134a336150187bf9 (patch) | |
| tree | 4cb8b8adeb871100362f9cd7d1e10dea17795528 /scripts | |
| parent | a7a56a64a48e6e7cc0b26ef0713af4f7920e9ec1 (diff) | |
Fix branch detection for drone PRs
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/analysis/analysis-wrapper.sh | 3 | ||||
| -rw-r--r-- | scripts/analysis/getBranchName.sh | 9 |
2 files changed, 11 insertions, 1 deletions
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 |