From 477ba697e3f771d6499901afa28bc8b84ad8bbc3 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Thu, 24 Sep 2026 11:06:38 +0100
Subject: [PATCH 1/3] Name unnamed jobs in release workflow

---
 .github/workflows/update-release-branch.yml | 2 ++
 pr-checks/excluded.yml                      | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
index 9f38f0f0b4..5eb3ed3740 100644
--- a/.github/workflows/update-release-branch.yml
+++ b/.github/workflows/update-release-branch.yml
@@ -25,6 +25,7 @@ jobs:
     uses: ./.github/workflows/prepare-release.yml
 
   update:
+    name: "Update release branch"
     timeout-minutes: 45
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch'
@@ -77,6 +78,7 @@ jobs:
           --conductor ${GITHUB_ACTOR}
 
   backport:
+    name: "Create backport"
     timeout-minutes: 45
     runs-on: ubuntu-latest
     environment: Automation
diff --git a/pr-checks/excluded.yml b/pr-checks/excluded.yml
index 1a5262fc0b..2a821043fe 100644
--- a/pr-checks/excluded.yml
+++ b/pr-checks/excluded.yml
@@ -5,6 +5,8 @@ contains:
   - "test-setup-python-scripts"
   - "update"
   - "Update"
+  # Matrix-ed job; the name starts with this
+  - "Create backport"
 is:
   - "Agent"
   - "check-expected-release-files"
@@ -16,3 +18,4 @@ is:
   - "Post repo size comment"
   - "Prepare"
   - "Upload results"
+  - "Update release branch"

From b435ce4361a4dffdd05d3a2c44751e7d9f60fb62 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Thu, 24 Sep 2026 11:12:09 +0100
Subject: [PATCH 2/3] Disambiguate "Prepare release" job naming

---
 .github/workflows/prepare-release.yml       | 2 +-
 .github/workflows/rollback-release.yml      | 3 +--
 .github/workflows/update-release-branch.yml | 3 +--
 pr-checks/excluded.yml                      | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 4eb300704d..8ece992d48 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -28,7 +28,7 @@ defaults:
 
 jobs:
   prepare:
-    name: "Prepare release"
+    name: "Release info"
     runs-on: ubuntu-latest
     if: github.repository == 'github/codeql-action'
 
diff --git a/.github/workflows/rollback-release.yml b/.github/workflows/rollback-release.yml
index c37f8a79ae..f0ca4e11d2 100644
--- a/.github/workflows/rollback-release.yml
+++ b/.github/workflows/rollback-release.yml
@@ -24,7 +24,7 @@ defaults:
 
 jobs:
   prepare:
-    name: "Prepare release"
+    name: "Prepare"
     if: github.repository == 'github/codeql-action'
 
     permissions:
@@ -184,4 +184,3 @@ jobs:
           # Setting this to `true` for non-workflow_dispatch events will
           # still push the `branch`, but won't create a corresponding PR
           dry-run: "${{ github.event_name != 'workflow_dispatch' }}"
-
diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml
index 5eb3ed3740..a506b87ce4 100644
--- a/.github/workflows/update-release-branch.yml
+++ b/.github/workflows/update-release-branch.yml
@@ -16,9 +16,8 @@ defaults:
     shell: bash
 
 jobs:
-
   prepare:
-    name: "Prepare release"
+    name: "Prepare"
     permissions:
       contents: read
 
diff --git a/pr-checks/excluded.yml b/pr-checks/excluded.yml
index 2a821043fe..5563a3e179 100644
--- a/pr-checks/excluded.yml
+++ b/pr-checks/excluded.yml
@@ -17,5 +17,6 @@ is:
   - "Label PR with size"
   - "Post repo size comment"
   - "Prepare"
+  - "Release info"
   - "Upload results"
   - "Update release branch"

From 415d925feeec43b3c2610f17e2ca48e3792c78ae Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Thu, 24 Sep 2026 11:36:37 +0100
Subject: [PATCH 3/3] Fix formatting of mergeback checklist

---
 .github/actions/prepare-mergeback-branch/action.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/actions/prepare-mergeback-branch/action.yml b/.github/actions/prepare-mergeback-branch/action.yml
index 2c57dfc012..8d22e547e6 100644
--- a/.github/actions/prepare-mergeback-branch/action.yml
+++ b/.github/actions/prepare-mergeback-branch/action.yml
@@ -92,8 +92,7 @@ runs:
           Please do the following:
 
           - [ ] Approve running the full set of PR checks.
-          - [ ] Approve and merge the PR. When merging the PR, make sure "Create a merge commit" is
-                selected rather than "Squash and merge" or "Rebase and merge".
+          - [ ] Approve and merge the PR. When merging the PR, make sure "Create a merge commit" is selected rather than "Squash and merge" or "Rebase and merge".
         EOF
         )