From 7cebccad74e2bbe0a361b8d088bbf012a98f0e2e Mon Sep 17 00:00:00 2001
From: Timo Pagel <github@timo-pagel.de>
Date: Fri, 9 Jan 2026 09:35:29 +0100
Subject: [PATCH] adjust

---
 .github/workflows/main.yml | 11 ++++++++++-
 .releaserc.json            |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6de2be9d..e60a44c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,7 +29,16 @@ jobs:
       - name: Get Semantic Release Version
         id: get-version
         run: |
-          VERSION=$(npx semantic-release --dry-run 2>&1 | grep -o 'Release note for version [0-9]\+\.[0-9]\+\.[0-9]\+' | head -1 | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+          # Check if latest commit is a merge commit
+          if git log --format="%s" -1 | grep -q "^Merge pull request"; then
+            echo "✅ Merge commit detected, forcing patch release"
+            # Get last tag and increment patch
+            LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//' || echo "0.0.0")
+            VERSION=$(echo $LAST_TAG | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g')
+          else
+            VERSION=$(npx semantic-release --dry-run 2>&1 | grep -o 'Release note for version [0-9]\+\.[0-9]\+\.[0-9]\+' | head -1 | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+          fi
+          
           if [ -z "$VERSION" ]; then
             echo "❌ No version could be detected by semantic-release"
             echo "This usually means no commits warrant a release (no feat/fix/breaking changes)"
diff --git a/.releaserc.json b/.releaserc.json
index feb1b18c..c42862ac 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -4,11 +4,11 @@
     [
       "@semantic-release/commit-analyzer",
       {
-        "preset": "angular",
+        "preset": "conventionalcommits",
         "releaseRules": [
           {"breaking": true, "release": "minor"},
           {"tag": "Breaking", "release": "minor"},
-          {"message": "/^Merge pull request/", "release": "patch"}
+          {"type": "*", "release": "patch"}
         ]
       }
     ],