From c8c3500be9cbb5f868854ce0698193f4b3518044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Fri, 24 Jun 2022 13:57:32 +0200 Subject: [PATCH] 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 --- .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