mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-21 20:45:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix branch detection for drone PRs

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2022-08-09 16:49:57 +02:00
parent a7a56a64a4
commit e321c02b25
No known key found for this signature in database
GPG key ID: 74434EFE0D2E2205
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

@ -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

3
scripts/analysis/analysis-wrapper.sh
View file

@ -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"

9
scripts/analysis/getBranchName.sh Normal file
View file

@ -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