From 888b8bb342ac36f4c4760c03b76c0922742447d1 Mon Sep 17 00:00:00 2001
From: Gauvain <contact@uruk.dev>
Date: Wed, 10 Jun 2026 20:20:56 +0200
Subject: [PATCH] fix(issue-form): pin checkout to develop, serialize runs,
 simplify release fetch

- `release` events check out the tagged commit, so the script regenerated
  the form from the tag's stale copy and the bot PR could revert form
  edits made on develop since that release - checkout develop explicitly.
- Fixed concurrency group: a release event and the weekly cron no longer
  race on the same ci/update-issue-form branch (queue, no cancel).
- Replace `gh api --paginate` (fetches every release page) with
  `gh release list --exclude-drafts --exclude-pre-releases --limit N`.
- Document the GITHUB_TOKEN limitation on the auto-merge step: bot PRs
  don't trigger required checks; close/reopen kicks them, then auto-merge
  completes after reviews.
---
 .github/workflows/update-issue-form.yml | 16 ++++++++++++++--
 scripts/update-issue-form.mjs           | 20 +++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/update-issue-form.yml b/.github/workflows/update-issue-form.yml
index 6ce2dcd00..8b5af9c8a 100644
--- a/.github/workflows/update-issue-form.yml
+++ b/.github/workflows/update-issue-form.yml
@@ -8,9 +8,11 @@ on:
     - cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
   workflow_dispatch:
 
+# Fixed group so a release event and the weekly cron can't race on the same
+# ci/update-issue-form branch — runs queue instead of force-pushing over each other.
 concurrency:
-  group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
-  cancel-in-progress: true
+  group: update-issue-form
+  cancel-in-progress: false
 
 permissions:
   contents: read
@@ -25,6 +27,11 @@ jobs:
     steps:
       - name: 📥 Checkout repository
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          # On `release` events GITHUB_SHA is the tagged commit — without this the
+          # script would regenerate the form from the tag's (stale) copy and the bot
+          # PR would revert any form edits made on develop since that release.
+          ref: develop
 
       - name: 🍞 Setup Bun
         uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
@@ -85,6 +92,11 @@ jobs:
         if: steps.cpr.outputs.pull-request-operation == 'created'
         env:
           GH_TOKEN: ${{ github.token }}
+        # Known limitation: PRs created with GITHUB_TOKEN don't trigger CI workflows
+        # (GitHub anti-recursion), so the required checks stay "Expected" until a
+        # maintainer kicks them (close/reopen the PR, or push an empty commit).
+        # Auto-merge is still worth enabling: once checks run and reviews land,
+        # the PR merges itself.
         run: |
           gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
             || echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."
diff --git a/scripts/update-issue-form.mjs b/scripts/update-issue-form.mjs
index d00e9e434..4b34aac8f 100644
--- a/scripts/update-issue-form.mjs
+++ b/scripts/update-issue-form.mjs
@@ -34,16 +34,23 @@ const DRY = process.argv.includes("--dry-run");
 // Matches "0.54.1" and prerelease/beta tags like "0.54.0-beta.1".
 const isVersion = (s) => /^\d+\.\d+/.test(s.trim());
 
-// 1. Fetch published releases (newest first), excluding drafts and prereleases —
-//    those aren't a full release users run, so they don't belong in the dropdown.
+// 1. Fetch the latest published releases (newest first) — drafts and prereleases
+//    aren't a full release users run, so they don't belong in the dropdown.
 const raw = execFileSync(
   "gh",
   [
-    "api",
-    `repos/${REPO}/releases`,
-    "--paginate",
+    "release",
+    "list",
+    "--repo",
+    REPO,
+    "--exclude-drafts",
+    "--exclude-pre-releases",
+    "--limit",
+    String(LIMIT),
+    "--json",
+    "tagName",
     "--jq",
-    ".[] | select(.draft == false and .prerelease == false) | .tag_name",
+    ".[].tagName",
   ],
   { encoding: "utf8" },
 );
@@ -55,7 +62,6 @@ for (const tag of raw.split("\n")) {
   if (!isVersion(ver) || seen.has(ver)) continue;
   seen.add(ver);
   versions.push(ver);
-  if (versions.length >= LIMIT) break;
 }
 
 if (!versions.length) {