diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml index c4d6797f3..a59140bcf 100644 --- a/.github/workflows/commit-queue.yml +++ b/.github/workflows/commit-queue.yml @@ -29,12 +29,9 @@ concurrency: jobs: land: name: Land - # 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' + # Quoted whole: the label name contains a colon, which an unquoted + # scalar would read as a mapping. + if: "github.event.label.name == '🚀 Status: Commit Queue'" runs-on: ubuntu-latest steps: - name: Mint a token for the app @@ -97,8 +94,8 @@ jobs: 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. + # The name sits in a URL path, where an emoji would not survive + # being interpolated raw. gh api --silent -X DELETE \ "repos/${GITHUB_REPOSITORY}/issues/${NUMBER}/labels/$(jq -rn --arg l "$LABEL" '$l|@uri')" \ || true diff --git a/collections/_docs/handbook/style/commit-messages.md b/collections/_docs/handbook/style/commit-messages.md index 8b4a0311f..a7784850c 100644 --- a/collections/_docs/handbook/style/commit-messages.md +++ b/collections/_docs/handbook/style/commit-messages.md @@ -11,9 +11,9 @@ request. Nothing here is a matter of taste that the checker is unaware of: if it passes, the message conforms. What lands is built from these messages rather than typed again at merge time. -Labelling a pull request `commit-queue` squashes it into one commit whose body -keeps every message it contained, with the trailers gathered where git reads -them and `PR-URL` added. +Labelling a pull request `🚀 Status: Commit Queue` squashes it into one commit +whose body keeps every message it contained, with the trailers gathered where +git reads them and `PR-URL` added. ## Subject