Skip to content

Add workflow to auto-merge PRs#107

Merged
MattIPv4 merged 4 commits intomainfrom
MattIPv4/auto-merge-workflow
Mar 4, 2026
Merged

Add workflow to auto-merge PRs#107
MattIPv4 merged 4 commits intomainfrom
MattIPv4/auto-merge-workflow

Conversation

@MattIPv4
Copy link
Member

@MattIPv4 MattIPv4 commented Mar 1, 2026

Adds a new workflow to automatically merge pull requests with the auto-merge label that have an approval after the most recent commit, and have been open for at least two days. This should make our lives a bit easier for things like Dependabot PRs, where we approve them when they're originally opened but often forget to merge them two days later per our policy.

@MattIPv4 MattIPv4 requested a review from a team as a code owner March 1, 2026 22:42
@MattIPv4 MattIPv4 requested review from avivkeller and Copilot March 1, 2026 22:42
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adds a scheduled GitHub Actions workflow to automatically merge eligible pull requests, primarily to reduce manual follow-up for PRs (e.g., Dependabot) that are approved but intentionally left open for a policy-mandated waiting period.

Changes:

  • Introduces a new scheduled workflow that scans open PRs on the default branch every 15 minutes.
  • Filters to PRs labeled auto-merge and open for at least 2 days.
  • Merges PRs (squash) when an approval exists after the most recent commit and the PR is mergeable.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@avivkeller

This comment was marked as resolved.

@MattIPv4 MattIPv4 force-pushed the MattIPv4/auto-merge-workflow branch 2 times, most recently from 3717e49 to 03e4823 Compare March 1, 2026 23:25
@MattIPv4 MattIPv4 force-pushed the MattIPv4/auto-merge-workflow branch from 03e4823 to e2b9147 Compare March 1, 2026 23:26
@MattIPv4 MattIPv4 requested a review from avivkeller March 1, 2026 23:38
Copy link
Contributor

@bmuenzenmeyer bmuenzenmeyer left a comment

Choose a reason for hiding this comment

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

i do think it would be a good idea to add harden-runner - we seem to use it elsewhere.
#101

thoughts?

@MattIPv4
Copy link
Member Author

MattIPv4 commented Mar 2, 2026

👍 Added, not sure it'll do much given we're just making GitHub API calls, but also no harm

@MattIPv4
Copy link
Member Author

MattIPv4 commented Mar 2, 2026

Will merge this in a couple of days and then try it out against the Dependabot PRs here 🫡

@MattIPv4 MattIPv4 added this pull request to the merge queue Mar 4, 2026
Merged via the queue into main with commit 49a0c18 Mar 4, 2026
4 checks passed
@MattIPv4 MattIPv4 deleted the MattIPv4/auto-merge-workflow branch March 4, 2026 14:20
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.

7 participants