Skip to content

ci: add an Approved-by trailer to squash merges - #324

Merged
mergify[bot] merged 1 commit into
mainfrom
devs/jd/jd/approved-by-trailer/add-approved-trailer-squash-merges--04bddd30
Oct 17, 2026
Merged

mergify[bot] merged 1 commit into
mainfrom
devs/jd/jd/approved-by-trailer/add-approved-trailer-squash-merges--04bddd30

Conversation

@jd

@jd jd commented Oct 16, 2026

Copy link
Copy Markdown
Member

The default queue rule squash-merges with the PR title and body.
Adding trailers: [approved-by] to its commit_message_format puts an
Approved-by: line for each approving reviewer at the end of the
squashed commit, so git log shows who approved a change without going
back to the pull request.

The dependencies rule merges with fast-forward, which keeps the
original commits and ignores commit_message_format, so it is left
unchanged.

mergify config validate passes.

Co-Authored-By: Claude Opus 5.5 noreply@anthropic.com

The `default` queue rule squash-merges with the PR title and body.
Adding `trailers: [approved-by]` to its `commit_message_format` puts an
`Approved-by:` line for each approving reviewer at the end of the
squashed commit, so `git log` shows who approved a change without going
back to the pull request.

The `dependencies` rule merges with fast-forward, which keeps the
original commits and ignores `commit_message_format`, so it is left
unchanged.

`mergify config validate` passes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Change-Id: I04bddd30713ef0fad73b6ce4ec07fc367b659dc3
Copilot AI balanced review requested due to automatic review settings October 16, 2026 23:21
@mergify
mergify Bot deployed to Mergify Merge Protections October 16, 2026 23:21 Active
@mergify

mergify Bot commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

Merge Protections

🟢 All 7 merge protections satisfied — ready to merge.

Show 7 satisfied protections

🟢 📃 Configuration Change Requirements

Mergify configuration change

  • any of:
    • check-success = @mergify/Configuration changed
    • check-success = @mergify/Configuration has been deleted

🟢 🤖 Continuous Integration

  • all of:
    • check-success=Test with Python 3.10
    • check-success=Test with Python 3.11
    • check-success=Test with Python 3.12
    • check-success=Test with Python 3.13
    • check-success=Test with Python 3.14
    • check-success=semgrep

🟢 👀 Review Requirements

  • any of:
    • #approved-reviews-by>=1
    • author = dependabot[bot]

🟢 Enforce conventional commit

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:

🟢 🔎 Reviews

  • #changes-requested-reviews-by = 0
  • #review-requested = 0
  • #review-threads-unresolved = 0

🟢 📕 PR description

  • body ~= (?ms:.{48,})

🟢 🚦 Auto-queue

When all merge protections are satisfied, this pull request will be queued automatically.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@mergify
mergify Bot requested a review from a team October 16, 2026 23:22
@jd
jd marked this pull request as ready for review October 17, 2026 08:33
@mergify

mergify Bot commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • ✅ Entered queue — 2026-10-17 09:04 UTC · Rule: default · triggered by merge protections
  • 🟠 Waiting for batch · (1/1 pull requests) — proceeds at 2026-10-17 09:04 UTC
  • ⏳ Merge

@mergify

mergify Bot commented Oct 17, 2026 •

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • ✅ Entered queue — 2026-10-17 09:04 UTC · Rule: default · triggered by merge protections
  • ✅ Checks skipped · PR is already up-to-date
  • ✅ Merged — 2026-10-17 09:04 UTC · at ddc2fc825b0bd527078ed5f7b11048cc39fd0dde · squash

This pull request spent 11 seconds in the queue, including 2 seconds running CI.

Required conditions to merge

@mergify mergify Bot added the queued label Oct 17, 2026
@mergify
mergify Bot merged commit ddc2fc8 into main Oct 17, 2026
9 of 10 checks passed
@mergify
mergify Bot deleted the devs/jd/jd/approved-by-trailer/add-approved-trailer-squash-merges--04bddd30 branch October 17, 2026 09:04
@mergify mergify Bot removed the queued label Oct 17, 2026

This branch was successfully deployed

1 active deployment
Mergify Merge Protections — 6046d6bb Deployed Oct 16, 2026 by mergify[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants