From 02dddecda36a305a04e5b4d7cb422e068c45ef8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@gmail.com>
Date: Mon, 8 Jun 2026 12:11:27 +0200
Subject: [PATCH] Create draft release with version bump

---
 .github/workflows/draft-release.yml | 49 -----------------------------
 .github/workflows/release.yml       | 14 +++++++--
 2 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 .github/workflows/draft-release.yml

diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
deleted file mode 100644
index c6af179..0000000
--- a/.github/workflows/draft-release.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Create draft release
-
-on:
-  pull_request:
-    branches: [main]
-    types: [closed]
-
-concurrency:
-  group: draft-release-${{ github.event.pull_request.number }}
-  cancel-in-progress: false
-
-jobs:
-  create-draft:
-    if: >-
-      github.event.pull_request.merged == true &&
-      startsWith(github.event.pull_request.head.ref, 'release/v')
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ github.sha }}
-
-      - name: Verify release version
-        id: version
-        env:
-          RELEASE_BRANCH: ${{ github.event.pull_request.head.ref }}
-        run: |
-          package_version=$(node -p "require('./package.json').version")
-          branch_version="${RELEASE_BRANCH#release/v}"
-
-          if [ "$package_version" != "$branch_version" ]; then
-            echo "::error::Package version $package_version does not match release branch version $branch_version"
-            exit 1
-          fi
-
-          echo "version=$package_version" >> "$GITHUB_OUTPUT"
-
-      - name: Create draft GitHub release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: v${{ steps.version.outputs.version }}
-          name: v${{ steps.version.outputs.version }}
-          target_commitish: ${{ github.sha }}
-          generate_release_notes: true
-          draft: true
-          prerelease: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d5d235c..e5b80f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,7 +69,16 @@ jobs:
           body: |
             Bumps the release version to `${{ steps.version.outputs.version }}`.
 
-            After merging this PR, a draft `v${{ steps.version.outputs.version }}` release will be created from the merged commit.
+            A draft `v${{ steps.version.outputs.version }}` release has been created. Merge this PR before publishing it.
+
+      - name: Create draft GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.version.outputs.version }}
+          name: v${{ steps.version.outputs.version }}
+          generate_release_notes: true
+          draft: true
+          prerelease: false
 
       - name: Write summary
         run: |
@@ -77,6 +86,5 @@ jobs:
             echo "## Version bump v${{ steps.version.outputs.version }} prepared"
             echo
             echo "1. Merge \`release/v${{ steps.version.outputs.version }}\`."
-            echo "2. The merge will create a draft \`v${{ steps.version.outputs.version }}\` release."
-            echo "3. Publish the draft release to publish npm version \`${{ steps.version.outputs.version }}\`."
+            echo "2. Publish the draft \`v${{ steps.version.outputs.version }}\` release to publish npm version \`${{ steps.version.outputs.version }}\`."
           } >> "$GITHUB_STEP_SUMMARY"