ci(arm): wait for the server's mergeable answer before merging #2029
No reviewers
Labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
jaylouisw/packetforge!2029
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "ci/1118-2027"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
What was broken
Arm auto-mergegoes green without merging. Evidence, all read from/actions/tasksand the pulls API:Every merge above landed via the scheduled pass, which rebases the branch and re-runs the whole five-job matrix on a fresh head. So each green PR paid a second matrix and 4-16 minutes of latency after its gate had already said yes.
The cause is the documented one in
pr-rebase.yml: Forgejo fillsmergeablefrom a background task, and a merge POST that arrives before it has answered is refused with 405 "Please try again later". The old loop retried the same POST three times 4 s apart and then exited 0 - which is also why the job takes 30-32 s (runs 6606-6627) doing nothing useful.The change
GET /pulls/:nformergeablefirst, bounded at 40 s (2 s interval), then POST the merge;CI / Test (Node *)legs required, stillhead_commit_idpinning the commit this run checked. Nothing can merge a red or unmergeable PR that could not before.Coverage unchanged
No test, job, matrix leg or check is removed or skipped. All three Node legs, smoke, docker and the syntax check still run in full.
Baseline and after-run ids will be recorded in a follow-up comment once this run reports.