From abf47646a1fda5d0d228f127e4c9a5e31e2776ed Mon Sep 17 00:00:00 2001 From: Torsten Ueberschar Date: Sun, 18 Jan 2026 13:19:07 +0100 Subject: [PATCH] fix release branch tagging --- .github/actions/bump-version/action.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/actions/bump-version/action.yaml b/.github/actions/bump-version/action.yaml index 9a1e1f6..c00f502 100644 --- a/.github/actions/bump-version/action.yaml +++ b/.github/actions/bump-version/action.yaml @@ -76,8 +76,18 @@ runs: BUMP_CMD="npm version prerelease --preid=dev --no-git-tag-version" ;; release*) - npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version - BUMP_CMD="npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version" + RELEASE_VERSION="" + if [[ "${BRANCH}" =~ ^release/v?([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then + RELEASE_VERSION="${BASH_REMATCH[1]}" + fi + + if [[ -n "${RELEASE_VERSION}" ]]; then + npm version "${RELEASE_VERSION}-rc.0" --no-git-tag-version --allow-same-version + BUMP_CMD="npm version prerelease --preid=rc --no-git-tag-version" + else + npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version + BUMP_CMD="npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version" + fi ;; *) npm version prerelease --preid=nightly-${BRANCH_SAFE} --no-git-tag-version