Skip to content

build: add Dependabot auto-merge workflow#105

Merged
github-actions[bot] merged 1 commit intomainfrom
dependabot-merge
Jan 9, 2026
Merged

build: add Dependabot auto-merge workflow#105
github-actions[bot] merged 1 commit intomainfrom
dependabot-merge

Conversation

@milkshakeuk
Copy link
Member

@milkshakeuk milkshakeuk commented Jan 2, 2026

This pull request replaces the previous Dependabot auto-approve workflow with a new, more robust auto-merge workflow. The new workflow ensures that Dependabot pull requests for minor and patch updates are automatically approved and merged only after all required checks have passed and the PR is up-to-date with the base branch. It also handles concurrency issues and provides detailed status comments on the PR.

Replacement and enhancement of Dependabot automation:

  • Removed the old .github/workflows/dependabot-auto-approve.yml workflow, which only auto-approved eligible Dependabot PRs.
  • Added a new .github/workflows/dependabot-auto-merge.yml workflow that not only auto-approves but also fast-forward merges eligible Dependabot PRs once all checks are complete and the PR is strictly up-to-date.

Key features of the new workflow:

  • Uses a GitHub App token for secure permissions and to interact with protected branches and checks.
  • Waits for all required checks (except itself) to complete and verifies that all have succeeded before proceeding to merge.
  • Automatically approves PRs if not already approved and labels them as "auto-approved".
  • Handles merge conflicts and out-of-date branches by requesting Dependabot to recreate the PR if necessary.
  • Posts a detailed comment on the PR summarizing the success or failure of the auto-merge process, updating the comment if it already exists.

@milkshakeuk milkshakeuk requested a review from a team as a code owner January 2, 2026 16:20
jrdh
jrdh previously approved these changes Jan 5, 2026
@milkshakeuk milkshakeuk force-pushed the dependabot-merge branch 3 times, most recently from c9e5249 to 45e084a Compare January 8, 2026 09:07
jrdh
jrdh previously approved these changes Jan 8, 2026
@milkshakeuk milkshakeuk force-pushed the dependabot-merge branch 2 times, most recently from 81a3024 to 86dd5b8 Compare January 8, 2026 14:40
@milkshakeuk milkshakeuk added the fast-forward triggers fast-forward merge workflow label Jan 9, 2026
@github-actions
Copy link

github-actions bot commented Jan 9, 2026

🎉 Success! 🎉

PR successfully Fast Forward merged in ✅.

@github-actions github-actions bot merged commit 29ddc06 into main Jan 9, 2026
13 checks passed
@github-actions github-actions bot deleted the dependabot-merge branch January 9, 2026 11:16
@github-actions github-actions bot removed the fast-forward triggers fast-forward merge workflow label Jan 9, 2026
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.

2 participants