Repository navigation
ci: squash-merge Dependabot PRs once their checks pass - #45
Merged
Merged
Conversation
Allow Pest 3.8/4/5 so every supported PHP version resolves, drop the always-on coverage and junit reports from phpunit.xml.dist, add PHP 8.5 to the matrices and run Tests and PHPStan on pull requests (push only on main).
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #45 +/- ##
=========================================
Coverage 92.85% 92.85%
Complexity 40 40
=========================================
Files 4 4
Lines 168 168
=========================================
Hits 156 156
Misses 12 12 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
The Dependabot auto-merge job has never merged anything: it used
gh pr merge --merge, and the "Require linear history" ruleset rejects merge commits (GraphQL: Merge commits are not allowed on this repository.). Every earlier Dependabot PR was merged by hand.mainhas no required checks, so--autowould merge immediately. The job pollsstatusCheckRollup(check runs and commit statuses, excluding its own workflow) until both the Tests and PHPStan workflows have registered checks and all checks have finished, then:A failed
ghcall is retried on the next poll; the 30-minute job timeout bounds the wait.pull_request.user.login, not the event actor), and aconcurrencygroup per PR cancels the older poller when Dependabot rebases.--squash --match-head-commit, so a Dependabot rebase during the wait cannot merge an untested head.--auto, which errors when mergeability is still unknown because auto-merge is disabled on the repo.checks: readandstatuses: read.Works together with #52, which makes Tests and PHPStan run for workflow-only PRs (GitHub Actions bumps), so those PRs have checks to wait for.
Tests
YAML validated; the polling
jqwas dry-run against PR #34's real check data (6 checks, all passed → would merge) and against a synthetic failed check (→ reported, no merge). The real end-to-end check is #34: after this merges,@dependabot rebaseon #34 re-triggers the job.Closes #37