From 5f6d8d8eab1446d1d8e22a2ab83a9a83830820b7 Mon Sep 17 00:00:00 2001 From: Torsten Ueberschar Date: Sun, 18 Jan 2026 13:25:43 +0100 Subject: [PATCH] when merge release branch, version is taken from there --- .github/actions/bump-version/action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/bump-version/action.yaml b/.github/actions/bump-version/action.yaml index c00f502..76ad771 100644 --- a/.github/actions/bump-version/action.yaml +++ b/.github/actions/bump-version/action.yaml @@ -57,7 +57,9 @@ runs: main) COMMIT_MSG="$(git log -1 --pretty=%B)" TARGET_VERSION="" - if [[ "${COMMIT_MSG}" =~ release/([0-9]+)\.([0-9]+) ]]; then + if [[ "${COMMIT_MSG}" =~ release/v?([0-9]+\.[0-9]+\.[0-9]+) ]]; then + TARGET_VERSION="${BASH_REMATCH[1]}" + elif [[ "${COMMIT_MSG}" =~ release/([0-9]+)\.([0-9]+) ]]; then TARGET_VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.0" elif [[ "${COMMIT_MSG}" =~ hotfix/([0-9]+\.[0-9]+\.[0-9]+) ]]; then TARGET_VERSION="${BASH_REMATCH[1]}"