From aef9423cfffe635980a3b0334895e89b194e6524 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sun, 28 Apr 2024 00:11:42 +0800 Subject: [PATCH] docker-dind: update fetch_build_tag.sh --- oci/base/alpine-docker-dind/fetch_build_tag.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oci/base/alpine-docker-dind/fetch_build_tag.sh b/oci/base/alpine-docker-dind/fetch_build_tag.sh index 67a8c88..665ea2b 100755 --- a/oci/base/alpine-docker-dind/fetch_build_tag.sh +++ b/oci/base/alpine-docker-dind/fetch_build_tag.sh @@ -17,10 +17,10 @@ BRANCH_NAME=$(git branch --show-current) # Logic to set the build tag based on branch and tag status if [[ "$BRANCH_NAME" == "main" ]]; then echo "BUILD_TAG=latest" >> $GITHUB_ENV -elif [[ "$BRANCH_NAME" =~ ^release/ ]] && [[ -z "$TAG" ]]; then +elif [[ "$BRANCH_NAME" =~ '^release*' ]] && [[ -z "$TAG" ]]; then PR_ID=$(git log | grep "Merge pull request" | head -n 1 | awk -F# '{print $2}' | awk '{print $1}') echo "BUILD_TAG=PR-${PR_ID}-$SHORT_COMMIT_ID" >> $GITHUB_ENV -elif [[ "$BRANCH_NAME" =~ ^release/ ]] && [[ ! -z "$TAG" ]]; then +elif [[ "$BRANCH_NAME" =~ '^release*' ]] && [[ ! -z "$TAG" ]]; then echo "BUILD_TAG=$TAG" >> $GITHUB_ENV else JIRA_TICKET=$(git branch | grep '^\*' | awk '{print $2}' | awk -F- '{print $1"-"$2}')