Test that PRs against a release branch only add commits that are present on the main branch

tailscale / tailscale

The easiest, most secure way to use WireGuard and 2FA.

https://tailscale.com

BSD 3-Clause "New" or "Revised" License

18.81k stars 1.46k forks source link

Test that PRs against a release branch only add commits that are present on the main branch #12457

Open irbekrm opened 3 months ago

irbekrm commented 3 months ago

What is the issue?

Our patch release process involves getting the patch PRs reviewed and merged into the main branch, from which the changes are cherry-picked into the required release branches via a second PR. It could be easy to make a human error when creating/reviewing the second cherry-pick PR, so it would be good to have an automated test that verifies that any commits PRed to a release branch are present in the main branch.

We should be able to achieve this via a GH actions test.

bradfitz commented 3 months ago

Shout out to my friends Change-Id and git cherry-pick -x here :)