diff options
| author | Tim Krüger <t@timkrueger.me> | 2022-06-24 14:57:32 +0300 |
|---|---|---|
| committer | Tim Krüger <t@timkrueger.me> | 2022-06-24 15:18:51 +0300 |
| commit | c8c3500be9cbb5f868854ce0698193f4b3518044 (patch) | |
| tree | 834b7bc0b1784b8d6a8f9b54a87def4a11c0196c | |
| parent | 0c18edf4c1824fd652fe11b94275dffe27985b66 (diff) | |
Replave 'getBranchName.sh' with Git command
Signed-off-by: Tim Krüger <t@timkrueger.me>
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rwxr-xr-x | scripts/analysis/getBranchName.sh | 9 |
2 files changed, 1 insertions, 10 deletions
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 |