From 4e5e89eeeb2b7889751f83cdcec597e6ead6f0b8 Mon Sep 17 00:00:00 2001 From: yaroslav-codefresh Date: Wed, 19 Apr 2023 02:18:17 +0300 Subject: [PATCH 1/2] add ability to fetch gerrit Change branch --- start.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/start.sh b/start.sh index fa610da..9941ecf 100644 --- a/start.sh +++ b/start.sh @@ -64,6 +64,18 @@ delete_process_lock_files () { fi } +git_checkout () { + revision="$REVISION" + # when revision is Gerrit branch we need to fetch it explicitly + if [[ "$REVISION" =~ ^refs/changes/[0-9]+/[0-9]+/[0-9]+$ ]]; then + echo "Fetching Gerrit Change ref: $REVISION" + git_retry git fetch origin $REVISION + revision="FETCH_HEAD" + fi + + git checkout $revision +} + trap exit_trap EXIT set -e @@ -165,7 +177,7 @@ if [ -d "$CLONE_DIR" ]; then if [ -n "$REVISION" ]; then echo "Updating repository to revision $REVISION" - git checkout $REVISION + git_checkout CURRENT_BRANCH="`git branch 2>/dev/null | grep '^*' | cut -d' ' -f2-`" @@ -184,7 +196,7 @@ if [ -d "$CLONE_DIR" ]; then cd $CLONE_DIR if [ -n "$REVISION" ]; then - git checkout $REVISION + git_checkout fi fi else @@ -193,7 +205,7 @@ else eval $GIT_COMMAND cd $CLONE_DIR if [ -n "$REVISION" ]; then - git checkout $REVISION + git_checkout fi fi From 11c7f6783bf4a4b2bd3152d5c9800d8e85575755 Mon Sep 17 00:00:00 2001 From: yaroslav-codefresh Date: Wed, 19 Apr 2023 02:18:28 +0300 Subject: [PATCH 2/2] bump version --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index ab5bb09..60051f1 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 10.1.17 +version: 10.1.18