Skip to content

Simplify merge queue workflow configuration - #173

Merged
jeduden merged 3 commits into
mainfrom
claude/bump-merge-action-dW9wn
Apr 26, 2026
Merged

Simplify merge queue workflow configuration#173
jeduden merged 3 commits into
mainfrom
claude/bump-merge-action-dW9wn

Conversation

@jeduden

@jeduden jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner

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

  • Removed dummy comment that was used for testing
  • Removed the permissions: {} block and job-level permission declarations (contents, pull-requests, actions, issues write)
  • Removed the conditional if statement that restricted the job to specific event types and repository conditions
  • Removed git identity configuration steps (email and name setup for merge-queue-bot)
  • Removed checkout token and persist-credentials parameters
  • Updated jeduden/merge-queue-action from v0.6.0 to v0.7.0
  • Simplified action inputs by removing default fallback values for bisect and batch_prs parameters

Implementation 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

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
Copilot AI review requested due to automatic review settings April 26, 2026 09:30
@codecov

codecov Bot commented Apr 26, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.60%. Comparing base (4e91011) to head (82a1f35).
⚠️ Report is 4 commits behind head on main.

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.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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-action from v0.6.0 to v0.7.0.
  • Simplified action inputs by passing workflow_dispatch inputs directly (no explicit fallbacks).

Comment thread .github/workflows/merge-queue.yml
Comment thread .github/workflows/merge-queue.yml
Comment thread .github/workflows/merge-queue.yml
Comment thread .github/workflows/merge-queue.yml
@jeduden jeduden added the queue Add to a PR to enqueue it label Apr 26, 2026
@jeduden jeduden added queue Add to a PR to enqueue it queue:active Applied automatically when a PR is in an active batch and removed queue Add to a PR to enqueue it labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden jeduden added queue Add to a PR to enqueue it and removed queue:active Applied automatically when a PR is in an active batch labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — requeued

The merge queue hit a transient error while processing this PR:

batch creation failed: git push origin merge-queue/batch-173-1777199939:refs/heads/merge-queue/batch-173-1777199939 failed (exit 128): remote: Permission to jeduden/mdsmith.git denied to github-actions[bot]. fatal: unable …

View merge queue run.

Next: No action needed — the queue will retry automatically on the next run.

@jeduden jeduden added the queue:active Applied automatically when a PR is in an active batch label Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden jeduden added queue Add to a PR to enqueue it and removed queue Add to a PR to enqueue it queue:active Applied automatically when a PR is in an active batch labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — requeued

The merge queue hit a transient error while processing this PR:

batch creation failed: git push origin merge-queue/batch-173-1777199958:refs/heads/merge-queue/batch-173-1777199958 failed (exit 128): remote: Permission to jeduden/mdsmith.git denied to github-actions[bot]. fatal: unable …

View merge queue run.

Next: No action needed — the queue will retry automatically on the next run.

@jeduden jeduden added queue:active Applied automatically when a PR is in an active batch and removed queue Add to a PR to enqueue it labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden jeduden added queue Add to a PR to enqueue it and removed queue:active Applied automatically when a PR is in an active batch labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — requeued

The merge queue hit a transient error while processing this PR:

batch creation failed: git push origin merge-queue/batch-173-1777199975:refs/heads/merge-queue/batch-173-1777199975 failed (exit 128): remote: Permission to jeduden/mdsmith.git denied to github-actions[bot]. fatal: unable …

View merge queue run.

Next: No action needed — the queue will retry automatically on the next run.

@jeduden jeduden added the queue:active Applied automatically when a PR is in an active batch label Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden jeduden removed the queue Add to a PR to enqueue it label Apr 26, 2026
@jeduden jeduden added queue Add to a PR to enqueue it and removed queue:active Applied automatically when a PR is in an active batch labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — requeued

The merge queue hit a transient error while processing this PR:

batch creation failed: git push origin merge-queue/batch-173-1777199991:refs/heads/merge-queue/batch-173-1777199991 failed (exit 128): remote: Permission to jeduden/mdsmith.git denied to github-actions[bot]. fatal: unable …

View merge queue run.

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
Copilot AI review requested due to automatic review settings April 26, 2026 10:40
@jeduden jeduden added queue:active Applied automatically when a PR is in an active batch and removed queue Add to a PR to enqueue it labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden jeduden added queue Add to a PR to enqueue it and removed queue:active Applied automatically when a PR is in an active batch labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — requeued

The merge queue hit a transient error while processing this PR:

batch creation failed: git push origin merge-queue/batch-173-1777200005:refs/heads/merge-queue/batch-173-1777200005 failed (exit 128): remote: Permission to jeduden/mdsmith.git denied to github-actions[bot]. fatal: unable …

View merge queue run.

Next: No action needed — the queue will retry automatically on the next run.

@jeduden jeduden added queue:active Applied automatically when a PR is in an active batch and removed queue Add to a PR to enqueue it labels Apr 26, 2026
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🟢 Merge Queue — picked up

This PR is in the queue and will be batched with other queue-labelled PRs.

Next: No action needed — you'll get another comment when CI starts on the batch. View merge queue run.

@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

🔵 Merge Queue — CI running

Merged into batch branch merge-queue/batch-173-1777200018. View CI run.

Next: No action needed — you'll be notified when CI completes.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

Comment on lines +33 to +34
bisect: ${{ github.event.inputs.bisect }}
batch_prs: ${{ github.event.inputs.batch_prs }}

Copilot AI Apr 26, 2026

Copy link

Choose a reason for hiding this comment

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

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.

Suggested change
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 || '' }}

Copilot uses AI. Check for mistakes.
Comment on lines 26 to 30
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 }}

Copilot AI Apr 26, 2026

Copy link

Choose a reason for hiding this comment

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

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).

Copilot uses AI. Check for mistakes.
@jeduden jeduden removed the queue:active Applied automatically when a PR is in an active batch label Apr 26, 2026
@jeduden
jeduden merged commit bae6afa into main Apr 26, 2026
16 checks passed
@jeduden

jeduden commented Apr 26, 2026

Copy link
Copy Markdown
Owner Author

Merge Queue — merged

This PR landed on main via commit bae6afa. CI run that validated the merge.

Next: Done — nothing more to do here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants