tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-09 16:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci/github-script/merge: add TODO about second merge method

Browse source 
We have not observed this merge method being used in practice, yet. Not
in the new bot, not in the old bot. It seems like auto-merge works for
all cases.
This commit is contained in:
Wolfgang Walther 2025-11-01 22:25:11 +01:00
parent db8f50b4de
commit 6848f93842
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/github-script/merge.js
View file

@ -180,6 +180,7 @@ async function handleMerge({
log('Auto Merge failed', e.response.errors[0].message)
}
// TODO: Observe whether the below is true and whether manual enqueue is actually needed.
// Auto-merge doesn't work if the target branch has already run all CI, in which
// case the PR must be enqueued explicitly.
// We now have merge queues enabled on all development branches, thus don't need a