From 696691f146b295e382a56f1aed65a607a587d00d Mon Sep 17 00:00:00 2001
From: Torsten Ueberschar <tu@uesome.de>
Date: Sat, 17 Jan 2026 20:54:40 +0100
Subject: [PATCH] pfffz

---
 .github/workflows/bump-version.yaml | 35 +++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml
index 6369e47..b0ed823 100644
--- a/.github/workflows/bump-version.yaml
+++ b/.github/workflows/bump-version.yaml
@@ -59,26 +59,43 @@ jobs:
               fi
 
               if [[ -n "${TARGET_VERSION}" ]]; then
-                if git rev-parse -q --verify "refs/tags/v${TARGET_VERSION}" >/dev/null; then
-                  echo "Tag v${TARGET_VERSION} already exists; skipping version bump."
-                  exit 0
-                fi
-                TAG="$(npm version "${TARGET_VERSION}" -m "update version: %s")"
+                npm version "${TARGET_VERSION}" --no-git-tag-version --allow-same-version
+                BUMP_CMD="npm version patch --no-git-tag-version"
               else
-                TAG="$(npm version patch -m "update version: %s")"
+                npm version patch --no-git-tag-version
+                BUMP_CMD="npm version patch --no-git-tag-version"
               fi
               ;;
             develop)
-              TAG="$(npm version prerelease --preid=dev -m "update version: %s")"
+              npm version prerelease --preid=dev --no-git-tag-version
+              BUMP_CMD="npm version prerelease --preid=dev --no-git-tag-version"
               ;;
             release*)
-              TAG="$(npm version prerelease --preid=rc-${BRANCH_SAFE} -m "update version: %s")"
+              npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version
+              BUMP_CMD="npm version prerelease --preid=rc-${BRANCH_SAFE} --no-git-tag-version"
               ;;
             *)
-              TAG="$(npm version prerelease --preid=nightly-${BRANCH_SAFE} -m "update version: %s")"
+              npm version prerelease --preid=nightly-${BRANCH_SAFE} --no-git-tag-version
+              BUMP_CMD="npm version prerelease --preid=nightly-${BRANCH_SAFE} --no-git-tag-version"
               ;;
           esac
 
+          VERSION="$(node -p "require('./package.json').version")"
+          while git rev-parse -q --verify "refs/tags/v${VERSION}" >/dev/null; do
+            echo "Tag v${VERSION} already exists; trying next version."
+            ${BUMP_CMD}
+            VERSION="$(node -p "require('./package.json').version")"
+          done
+
+          if git diff --quiet; then
+            echo "No version file changes; tagging current commit."
+          else
+            git add package.json package-lock.json 2>/dev/null || true
+            git commit -m "update version: v${VERSION}"
+          fi
+          TAG="v${VERSION}"
+          git tag "${TAG}"
+
           git push origin HEAD
           git push origin "${TAG}"