Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/commit-queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions collections/_docs/handbook/style/commit-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading