Skip to content

fix: verify if PR was manually merged with auto-merge config #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2023
Merged

fix: verify if PR was manually merged with auto-merge config #422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ddd318
fix: verify if manually merged with auto-merge config
Jun 29, 2023
d47802a
Update pkg/digger/digger.go
fleroux514 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions pkg/digger/digger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ import (
"digger/pkg/usage"
"errors"
"fmt"
"github.com/dominikbraun/graph"
"log"
"os"
"path"
"strings"
"time"

"github.com/dominikbraun/graph"
)

type CIName string
Expand Down Expand Up @@ -264,28 +265,39 @@ func SortedCommandsByDependency(project []models.ProjectCommand, dependencyGraph

func MergePullRequest(ciService ci.CIService, prNumber int) {
time.Sleep(5 * time.Second)
combinedStatus, err := ciService.GetCombinedPullRequestStatus(prNumber)

// Check if it was manually merged
isMerged, err := ciService.IsMerged(prNumber)
if err != nil {
log.Fatalf("failed to get combined status, %v", err)
log.Fatalf("error checking if PR is merged: %v", err)
}

if combinedStatus != "success" {
log.Fatalf("PR is not mergeable. Status: %v", combinedStatus)
}
if !isMerged {
combinedStatus, err := ciService.GetCombinedPullRequestStatus(prNumber)

prIsMergeable, err := ciService.IsMergeable(prNumber)
if err != nil {
log.Fatalf("failed to get combined status, %v", err)
}

if err != nil {
log.Fatalf("failed to check if PR is mergeable, %v", err)
}
if combinedStatus != "success" {
log.Fatalf("PR is not mergeable. Status: %v", combinedStatus)
}

if !prIsMergeable {
log.Fatalf("PR is not mergeable")
}
prIsMergeable, err := ciService.IsMergeable(prNumber)

err = ciService.MergePullRequest(prNumber)
if err != nil {
log.Fatalf("failed to merge PR, %v", err)
if err != nil {
log.Fatalf("failed to check if PR is mergeable, %v", err)
}

if !prIsMergeable {
log.Fatalf("PR is not mergeable")
}

err = ciService.MergePullRequest(prNumber)
if err != nil {
log.Fatalf("failed to merge PR, %v", err)
}
} else {
log.Printf("PR is already merged, skipping merge step")
}
}