Skip to content

1.3.0 - Better merge-conflict handling and new PR status API.

Compare
Choose a tag to compare
@martingjaldbaek martingjaldbaek released this 20 Sep 08:57
· 7 commits to master since this release
f0870b5
  • Better merge conflict handling: Instead of failing when there's merge conflicts, the workflow now recovers gracefully and just merges as many PRs as it can, and lists which PRs were not included due to merge conflicts.
    • This should make the workflow much more "hands off" to use, since you don't need to manually exclude problematic branches with the exclude label.
    • In my own testing, with ~20 PRs, just running the workflow twice was enough to get everything merged.
    • Note that the workflow no longer does "octopus" merges (merging many branches with a single merge commit) in order to be able to recover if any individual merge fails.
  • Switched to using the StatusRollUp field in the GitHub GraphQL API to check the state of the branch (it doesn't look like this is part of the GitHub REST API).
    • This combines statuses from both GitHub Actions CI and external CI, so the workflow now supports both out of the box.
    • This was one of the most requested features, so should make a lot of people happy.