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

Meta: Consider introducing GitHub Merge Queue to the repo #3567

Closed
3 tasks done
rami3l opened this issue Dec 7, 2023 · 4 comments
Closed
3 tasks done

Meta: Consider introducing GitHub Merge Queue to the repo #3567

rami3l opened this issue Dec 7, 2023 · 4 comments
Assignees
Labels
meta This issue is related to project management.

Comments

@rami3l
Copy link
Member

rami3l commented Dec 7, 2023

Maybe it's time to introduce a "conclusion" CI action and a merge queue. We already have automerge=true configured in renovate, but since there's no "conclusion" configured in our branch protection settings, auto-merging will not work. OTOH once that's been added, renovate will automatically put semver-compatible updates into the merge queue (cf. renovatebot/renovate#20569).

Originally posted by @rami3l in #3565 (comment)


Tasks

@djc
Copy link
Contributor

djc commented Dec 13, 2023

Sounds good to me!

@rami3l rami3l self-assigned this Dec 13, 2023
@rami3l
Copy link
Member Author

rami3l commented Dec 14, 2023

@djc For the record, an example of the conclusion step can be found in PyO3, however this will probably require moving all CI workflows into a single file (which should be done with a refactoring of ci/actions-templates/gen-workflows.sh), so this might take a while.

@rami3l
Copy link
Member Author

rami3l commented Jan 4, 2024

New concern raised in #3582 (comment).

Update: Addressed in #3627.

@rami3l
Copy link
Member Author

rami3l commented Jan 5, 2024

GHMQ is now online with "rebase and merge" as the default action.

Thanks a lot for your help and support, @jdno and @djc!

@rami3l rami3l closed this as completed Jan 5, 2024
@rami3l rami3l added the meta This issue is related to project management. label Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
meta This issue is related to project management.
Projects
None yet
Development

No branches or pull requests

2 participants