Skip to content

techmatters/test-merge-group-action

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

35 Commits
 
 
 
 

Repository files navigation

Overview

This is a test repo for github action merge groups.

Merge queues and the merge_group github action trigger can be used to reject PR merges that fail a set of in depth tests after the "merge when ready" button is clicked on a PR.

Key Learnings

  • The check for the merge group job must be a required check under the repository's Settings > Branches > Branch protection rules
  • Merge groups don't work with branch protection that targets a wildcard. You must specify a full branch name. This means that we'd forced into a long running release branch if we want to leverage merge groups for release branch PRs.
  • Merge group triggers WILL run on PR actions. We have to use a hacky if statement to work around this limitation. That causes a lot of noise in the action history.
  • Merge strategy has to be set to squash or merge commit as part of the merge group config. Can't be specified by developer.
  • Merge queues create a new branch from master, merge any outstanding merges into that branch, and then run tests. This means if two developers merge a pr at nearly the same time, the code will be tested together and both merges rejected if there are failures. This will probably never happen unless our team grows significantly, but is a part of the pattern folks should be aware of.

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Packages

No packages published