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

github: investigate merge queues #4420

Open
matzf opened this issue Oct 12, 2023 · 0 comments
Open

github: investigate merge queues #4420

matzf opened this issue Oct 12, 2023 · 0 comments
Assignees
Labels
i/needs investigation Issues/proposals that need to be confirmed/explored

Comments

@matzf
Copy link
Member

matzf commented Oct 12, 2023

We currently use the setting "Require branches to be up to date before merging":

This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled.

This is good because it ensures that commits in master always pass the status checks, i.e. CI runs. However, it makes it somewhat cumbersome and slow to merge multiple PRs in sequence, as the branches need to be updated manually and the CI checks occur entirely sequentially.

Github has a feature called "Merge Queue", that essentially automate this process. See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

Investigate if this can be used with our workflows and the integrated tools, i.e.

  • buildkite
  • readthedocs
  • reviewable
  • viper/gobra code verification
@matzf matzf added i/needs investigation Issues/proposals that need to be confirmed/explored workitem Something needs doing labels Oct 12, 2023
@matzf matzf changed the title github github: investigate merge queues Oct 12, 2023
@matzf matzf self-assigned this Oct 12, 2023
@matzf matzf removed the workitem Something needs doing label Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
i/needs investigation Issues/proposals that need to be confirmed/explored
Projects
None yet
Development

No branches or pull requests

1 participant