qmcpack icon indicating copy to clipboard operation
qmcpack copied to clipboard

Explore GitHub options to automatically update develop onto approved automerge and tested PR branch

Open williamfgc opened this issue 3 years ago • 3 comments

Is your feature request related to a problem? Please describe. Currently, when PRs come simultaneously they get out-of-sync with any changes to the target develop branch. The goal is to update automatically an already approved and tested PR branch (currently merging or rebasing develop).

Describe the solution you'd like Tested and approved PRs shouldn't go out of sync, and ideally be rebased from the latest develop branch.

Describe alternatives you've considered Options to explore: GitHub Actions that could do these (if any?) or a GitHub probot

Additional context This could be a bit invasive to the PR owner/contributors as it will make any pre-existing local branch non fast forward with the remote PR branch.

williamfgc avatar Feb 21 '22 17:02 williamfgc

The content of the title is important: I think we only want this for PRs that have been approved for Automerge and where the tests have been run successfully once. Therefore the admins will be able to approve for automerge a handful of PRs and they will be updated and merged in sequence. Currently this requires human steps for every PR.

prckent avatar Feb 21 '22 17:02 prckent

I'm not sure if we'd like to do rebase. merge develop into the feature branch is more common.

ye-luo avatar Feb 25 '22 21:02 ye-luo

#3878 is ready to be looked at, but I will leave it in a draft state as I'd want to clean up commits before it got merged.

walshmm avatar Apr 08 '22 18:04 walshmm