STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only merge PRs if branch checks have passed

Browse source
This commit is contained in:
Cristian Dominguez 2021-07-04 21:38:17 -03:00
parent 6115868343
commit bcab8c0766
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/cmd/pr/merge/merge.go
View file

@ -196,7 +196,8 @@ func mergeRun(opts *MergeOptions) error {
return cmdutil.SilentError
}
if !opts.AutoMergeEnable && pr.MergeStateStatus == "BLOCKED" {
approved := pr.MergeStateStatus == "CLEAN" || pr.MergeStateStatus == "HAS_HOOKS" || pr.MergeStateStatus == "UNSTABLE"
if !opts.AutoMergeEnable && !approved {
fmt.Fprintf(
opts.IO.ErrOut,
"%s Merging is blocked. Enable auto-merge to automatically merge it when all requirements are met with: gh pr merge %d --auto\n",
@ -206,7 +207,7 @@ func mergeRun(opts *MergeOptions) error {
deleteBranch := opts.DeleteBranch
crossRepoPR := pr.HeadRepositoryOwner.Login != baseRepo.RepoOwner()
autoMerge := opts.AutoMergeEnable && pr.MergeStateStatus == "BLOCKED"
autoMerge := opts.AutoMergeEnable && !approved
isPRAlreadyMerged := pr.State == "MERGED"
if !isPRAlreadyMerged {