From cf4d5add618522508960fbfaadfdd8569c36733f Mon Sep 17 00:00:00 2001
From: Derek Lewis <DerekNonGeneric@inf.is>
Date: Tue, 25 Aug 2026 21:12:58 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=E2=99=BB=EF=B8=8F?=
 =?UTF-8?q?=EF=BC=9Alet=20the=20queue=20label=20take=20either=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every other label here is named with an emoji and a category. The queue
label is not, and it cannot simply be renamed: the workflow that runs
is the one on the base branch, so a rename lands before the workflow
that understands it and nothing can be landed in between -- including
the change that would fix it.

Matching both spellings removes the ordering problem. The rename can
happen whenever after this, and the plain name can be dropped from here
once nothing is labelled with it.

The label also comes back off through a URL path, where an emoji name
does not survive being interpolated raw. It is percent-encoded now, and
taken from the event rather than written out, so whichever name
triggered the run is the one removed.

Signed-off-by: Derek Lewis <DerekNonGeneric@inf.is>
Assisted-by: Claude-Code:claude-opus-5
---
 .github/workflows/commit-queue.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml
index 3203b1bfa..c4d6797f3 100644
--- a/.github/workflows/commit-queue.yml
+++ b/.github/workflows/commit-queue.yml
@@ -1,4 +1,4 @@
-# Landing a pull request when it is labelled `commit-queue`.
+# Landing a pull request when it is labelled for the queue.
 #
 # `pull_request_target` runs in the context of the base branch and can reach
 # secrets, which `pull_request` cannot do for a fork. That is only safe while
@@ -29,7 +29,12 @@ concurrency:
 jobs:
   land:
     name: Land
-    if: github.event.label.name == 'commit-queue'
+    # Both spellings, so the label can be renamed without a window in
+    # which nothing lands: the workflow that runs is the one on the base
+    # branch, not the one under review.
+    if: >-
+      github.event.label.name == 'commit-queue' ||
+      github.event.label.name == '🚀 Status: Commit Queue'
     runs-on: ubuntu-latest
     steps:
       - name: Mint a token for the app
@@ -90,9 +95,12 @@ jobs:
         env:
           GH_TOKEN: ${{ steps.token.outputs.token }}
           NUMBER: ${{ github.event.pull_request.number }}
+          LABEL: ${{ github.event.label.name }}
         run: |
+          # Whichever spelling triggered this, percent-encoded: the name sits
+          # in a URL path and an emoji one would not survive it raw.
           gh api --silent -X DELETE \
-            "repos/${GITHUB_REPOSITORY}/issues/${NUMBER}/labels/commit-queue" \
+            "repos/${GITHUB_REPOSITORY}/issues/${NUMBER}/labels/$(jq -rn --arg l "$LABEL" '$l|@uri')" \
             || true
 
       - name: Say why it did not land