Race condition when merging main and release PR

[cekpowell]

Hey all - loving the action ! Everything is working really nicely in our repo at the moment, we just have one small issue. The steps to produce this issue are as follows:

• Have a release please PR open targeting main.
• Have some 'feature' PR open also targeting main.
• Merge the feature PR into main.
• Straight after this, merge the release PR into main as well.

The result:

• The release-please action does not have time to run before being merged in on top of the feature branch. This means the release commit is placed above the feature commit in the history on main, even though it wasn't technically included in the release. This is especially bad for us, where we run several integration tests on the release PR before it can be merged.

Off the back of a release being created, we then check out the commit hash of the release and deploy to our production environment. In this situation, we will end up deploying a commit (the feature that was merged in just before the release PR) to production before it has gone through proper testing.

At the moment, our current solution has been to check the 'require branches to be up to date before merging' option in our branch protection rule. However, this is creating a bad developer experience as now ALL PRs have to be up to date with main before they can be merged in, which means developers are having to resync with main and test multiple times for each PR.

What would be the best approach here ? Would really appreciate some suggestions / help on this one - thanks very much :)