Simplify merge queue workflow configuration - #173
Conversation
Update to 0db908703757821c0e1225214d94152b6a75dd30 and adopt the new integration pattern: v0.7.0 handles git identity and eligibility filtering internally, so remove the explicit `if:` condition, the Configure git identity step, job/top-level permissions declarations, and the token/persist-credentials from checkout. https://claude.ai/code/session_01K5zKwQqY9h9EBvnd3H7jMD
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #173 +/- ##
=======================================
Coverage 89.60% 89.60%
=======================================
Files 112 112
Lines 12062 12062
=======================================
Hits 10808 10808
Misses 796 796
Partials 458 458 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull request overview
Simplifies the repository’s merge-queue GitHub Actions workflow by removing explicit gating/permissions/configuration and upgrading the jeduden/merge-queue-action dependency.
Changes:
- Removed the job-level conditional gating and several explicit workflow/job settings (permissions, git identity config, checkout token/credential persistence).
- Updated
jeduden/merge-queue-actionfrom v0.6.0 to v0.7.0. - Simplified action inputs by passing
workflow_dispatchinputs directly (no explicit fallbacks).
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
⏳ Merge Queue — requeued The merge queue hit a transient error while processing this PR:
Next: No action needed — the queue will retry automatically on the next run. |
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
⏳ Merge Queue — requeued The merge queue hit a transient error while processing this PR:
Next: No action needed — the queue will retry automatically on the next run. |
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
⏳ Merge Queue — requeued The merge queue hit a transient error while processing this PR:
Next: No action needed — the queue will retry automatically on the next run. |
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
⏳ Merge Queue — requeued The merge queue hit a transient error while processing this PR:
Next: No action needed — the queue will retry automatically on the next run. |
Without the token in checkout, git operations fall back to github-actions[bot] which is denied push by branch protection. https://claude.ai/code/session_01K5zKwQqY9h9EBvnd3H7jMD
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
⏳ Merge Queue — requeued The merge queue hit a transient error while processing this PR:
Next: No action needed — the queue will retry automatically on the next run. |
|
🟢 Merge Queue — picked up This PR is in the queue and will be batched with other Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run. |
|
🔵 Merge Queue — CI running Merged into batch branch Next: No action needed — you'll be notified when CI completes. |
| bisect: ${{ github.event.inputs.bisect }} | ||
| batch_prs: ${{ github.event.inputs.batch_prs }} |
There was a problem hiding this comment.
bisect and batch_prs are now always passed as ${{ github.event.inputs.* }}. For pull_request events, github.event.inputs is not defined, so these will evaluate to an empty value that can override the action’s defaults (and potentially break boolean parsing). Consider restoring the explicit fallbacks (|| false / || '') or otherwise ensuring these inputs are only set for workflow_dispatch runs.
| bisect: ${{ github.event.inputs.bisect }} | |
| batch_prs: ${{ github.event.inputs.batch_prs }} | |
| bisect: ${{ github.event.inputs.bisect || false }} | |
| batch_prs: ${{ github.event.inputs.batch_prs || '' }} |
| token: ${{ secrets.MERGE_QUEUE_TOKEN }} | ||
| persist-credentials: false | ||
|
|
||
| - name: Configure git identity | ||
| run: | | ||
| git config user.email "merge-queue@users.noreply.github.com" | ||
| git config user.name "merge-queue-bot" | ||
|
|
||
| - uses: jeduden/merge-queue-action@5adb5a76e27e96f1da5efd36f097a2c5233e9ad3 # v0.6.0 | ||
| - uses: jeduden/merge-queue-action@3be8077b142e4057d2fc097635d1ab6ada2bbbf5 # v0.7.1 | ||
| with: | ||
| token: ${{ secrets.MERGE_QUEUE_TOKEN }} |
There was a problem hiding this comment.
PR description says the action was updated to v0.7.0, but the workflow pins v0.7.1 here. Also, the description mentions removing the checkout token, but actions/checkout still uses secrets.MERGE_QUEUE_TOKEN. Please align the PR description with what’s actually changed (or adjust the workflow if the intent was different).
|
✅ Merge Queue — merged This PR landed on Next: Done — nothing more to do here. |
Summary
This PR simplifies the merge queue GitHub Actions workflow by removing unnecessary configuration and updating to a newer version of the merge-queue-action.
Key Changes
permissions: {}block and job-level permission declarations (contents, pull-requests, actions, issues write)ifstatement that restricted the job to specific event types and repository conditionsjeduden/merge-queue-actionfrom v0.6.0 to v0.7.0bisectandbatch_prsparametersImplementation Details
The workflow now relies on the merge-queue-action's built-in defaults and conditions rather than explicitly defining them in the workflow. The removal of git configuration suggests this is now handled by the updated action version. The simplified input parameters indicate the action v0.7.0 has better defaults for optional inputs.
https://claude.ai/code/session_01K5zKwQqY9h9EBvnd3H7jMD