search

andk / pause

Perl authors upload server
http://pause.perl.org/
150 stars 57 forks source link

Setup enforce-rebase action #530

Open rspier opened 2 months ago

rspier commented 2 months ago

Based on https://github.com/cyberark/enforce-rebase

rspier commented 2 months ago

You can see my noodling with this including passes and fails at https://github.com/rspier/pause/actions?query=enforce-rebase

haarg commented 2 months ago

GitHub's branch protection rules have a "Require branches to be up to date before merging" setting (under "Require status checks to pass before merging") that may help with this.

rspier commented 2 months ago

Thanks Graham. I wonder if that's new. It's definitely a bit buried. And that's definitely cleaner than a custom workflow.

image

We might actually want both this check and GitHub's enforcement.

Here's what it looks like in action. image

Someone inadvertantly clicking Update Branch could create the merge commit we're trying to avoid.

@andk is the only one with admin permission to set it up right now.

FYI @rjbs