Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update merge queue #6

Closed
jolheiser opened this issue Mar 9, 2023 · 2 comments · Fixed by #31
Closed

Update merge queue #6

jolheiser opened this issue Mar 9, 2023 · 2 comments · Fixed by #31

Comments

@jolheiser
Copy link
Collaborator

As we merge PRs, this code could also update 2-3 of the next-in-line PRs to be merged that have reviewed/wait-merge.

It may also be beneficial to do this per-branch, so we update things targeting main as well as release/v1.19 etc.

/cc @delvh

@delvh
Copy link
Collaborator

delvh commented Mar 9, 2023

To recap the discussion @jolheiser and myself had already:
If we only update one, it is possible that the CI fails and manual interaction will be required.
If we update all, we will put a lot of unnecessary strain on the CI as it needs to run a lot of pipelines without any reason.
Thus, a compromise would be to use two to three PRs per branch.
I'm rather in favor of 3 as it allows for a higher CI error probability.

One thing we need to ensure is a consistent merge queue order for it to work correctly.

@jolheiser
Copy link
Collaborator Author

One thing we need to ensure is a consistent merge queue order for it to work correctly.

I was thinking just a search query that orders them by index asc, so oldest PR is first in the queue. This could potentially be disrupted if an older PR is added to the queue, but I think it should be mostly consistent more often than not?

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 a pull request may close this issue.

2 participants