Skip to content
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

Skip Checks API neutral state #278

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Skip Checks API neutral state #278

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1901c2
The neutral status cannot be determined as success or failure, so the…
yamachu Nov 15, 2021
c6d909a
Add method to determine CI is in progress or not
yamachu Nov 17, 2021
417f9ef
Separate Status and CheckSuite Event struct
yamachu Nov 28, 2021
9e5baff
Remove unused method
yamachu Nov 28, 2021
1769fde
Duplicate checkAutoBranch for each Event
yamachu Nov 28, 2021
b4c8892
The neutral status cannot be determined as success or failure, so the…
yamachu Nov 28, 2021
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
208 changes: 177 additions & 31 deletions epic/check_autobranch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/voyagegroup/popuko/setting"
)

// FIXME: Name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yamachu Would you fix this comment before merging this?

type StateChangeInfo struct {
Status string
Owner string
Name string
DefaultBranch string
Expand All @@ -22,35 +22,116 @@ type StateChangeInfo struct {
IsRelatedToAutoBranchBody func(string) bool
}

type StatusEventInfo struct {
State string
StateChangeInfo
}

type CheckSuiteEventInfo struct {
Status string
Conclusion string
StateChangeInfo
}

func CheckAutoBranchWithStatusEvent(ctx context.Context, client *github.Client, autoMergeRepo *queue.AutoMergeQRepo, ev *github.StatusEvent) {
info := StateChangeInfo{
Status: *ev.State,
Owner: *ev.Repo.Owner.Login,
Name: *ev.Repo.Name,
DefaultBranch: ev.Repo.GetDefaultBranch(),
NotHandle: *ev.State == "pending",
ID: *ev.ID,
SHA: *ev.SHA,
IsRelatedToAutoBranchBody: isRelatedToAutoBranchBodyWithStatusEvent(ev),
}
checkAutoBranch(ctx, client, autoMergeRepo, info)
info := StatusEventInfo{
State: *ev.State,
StateChangeInfo: StateChangeInfo{
Owner: *ev.Repo.Owner.Login,
Name: *ev.Repo.Name,
DefaultBranch: ev.Repo.GetDefaultBranch(),
NotHandle: *ev.State == "pending",
ID: *ev.ID,
SHA: *ev.SHA,
IsRelatedToAutoBranchBody: isRelatedToAutoBranchBodyWithStatusEvent(ev),
},
}
checkAutoBranchWithStatusEvent(ctx, client, autoMergeRepo, info)
}

func CheckAutoBranchWithCheckSuiteEvent(ctx context.Context, client *github.Client, autoMergeRepo *queue.AutoMergeQRepo, ev *github.CheckSuiteEvent) {
info := StateChangeInfo{
Status: *ev.CheckSuite.Conclusion,
Owner: *ev.Repo.Owner.Login,
Name: *ev.Repo.Name,
DefaultBranch: ev.Repo.GetDefaultBranch(),
NotHandle: *ev.CheckSuite.Status != "completed",
ID: *ev.CheckSuite.ID,
SHA: *ev.CheckSuite.HeadSHA,
IsRelatedToAutoBranchBody: isRelatedToAutoBranchBodyWithCheckSuiteEvent(ev),
}
checkAutoBranch(ctx, client, autoMergeRepo, info)
info := CheckSuiteEventInfo{
Status: *ev.CheckSuite.Status,
Conclusion: *ev.CheckSuite.Conclusion,
StateChangeInfo: StateChangeInfo{
Owner: *ev.Repo.Owner.Login,
Name: *ev.Repo.Name,
DefaultBranch: ev.Repo.GetDefaultBranch(),
NotHandle: *ev.CheckSuite.Status != "completed",
ID: *ev.CheckSuite.ID,
SHA: *ev.CheckSuite.HeadSHA,
IsRelatedToAutoBranchBody: isRelatedToAutoBranchBodyWithCheckSuiteEvent(ev),
},
}
checkAutoBranchWithCheckSuiteEvent(ctx, client, autoMergeRepo, info)
}

func checkAutoBranchWithStatusEvent(ctx context.Context, client *github.Client, autoMergeRepo *queue.AutoMergeQRepo, info StatusEventInfo) {
log.Println("info: Start: checkAutoBranch")
defer log.Println("info: End: checkAutoBranch")

if info.NotHandle {
log.Printf("info: Not handle %v in this event\n", info.State)
return
}
log.Printf("info: Start to handle in this event: %v\n", info.State)

log.Printf("info: Target repository is %v/%v\n", info.Owner, info.Name)

repoInfo := GetRepositoryInfo(ctx, client.Repositories, info.Owner, info.Name, info.DefaultBranch)
if repoInfo == nil {
log.Println("debug: cannot get repositoryInfo")
return
}

log.Println("info: success to load the configure.")

if !repoInfo.EnableAutoMerge {
log.Println("info: this repository does not enable merging into master automatically.")
return
}
log.Println("info: Start to handle auto merging the branch.")

qHandle := autoMergeRepo.Get(info.Owner, info.Name)
if qHandle == nil {
log.Println("error: cannot get the queue handle")
return
}

qHandle.Lock()
defer qHandle.Unlock()

q := qHandle.Load()

if !q.HasActive() {
log.Println("info: there is no testing item")
return
}

active := q.GetActive()
if active == nil {
log.Println("error: `active` should not be null")
return
}
log.Println("info: got the active item.")

if !isRelatedToAutoBranch(active, info.StateChangeInfo, repoInfo.AutoBranchName) {
log.Printf("info: The event's tip sha does not equal to the one which is tesing actively in %v/%v\n", info.Owner, info.Name)
return
}
log.Println("info: the status event is related to auto branch.")

mergeSucceedItemWithStatusEvent(ctx, client, info.Owner, info.Name, repoInfo, q, info)

q.RemoveActive()
q.Save()

tryNextItem(ctx, client, info.Owner, info.Name, q, repoInfo.AutoBranchName)

log.Println("info: complete to start the next trying")
}

func checkAutoBranch(ctx context.Context, client *github.Client, autoMergeRepo *queue.AutoMergeQRepo, info StateChangeInfo) {
func checkAutoBranchWithCheckSuiteEvent(ctx context.Context, client *github.Client, autoMergeRepo *queue.AutoMergeQRepo, info CheckSuiteEventInfo) {
log.Println("info: Start: checkAutoBranch")
defer log.Println("info: End: checkAutoBranch")

Expand Down Expand Up @@ -99,13 +180,13 @@ func checkAutoBranch(ctx context.Context, client *github.Client, autoMergeRepo *
}
log.Println("info: got the active item.")

if !isRelatedToAutoBranch(active, info, repoInfo.AutoBranchName) {
if !isRelatedToAutoBranch(active, info.StateChangeInfo, repoInfo.AutoBranchName) {
log.Printf("info: The event's tip sha does not equal to the one which is tesing actively in %v/%v\n", info.Owner, info.Name)
return
}
log.Println("info: the status event is related to auto branch.")

mergeSucceedItem(ctx, client, info.Owner, info.Name, repoInfo, q, info)
mergeSucceedItemWithCheckSuiteEvent(ctx, client, info.Owner, info.Name, repoInfo, q, info)

q.RemoveActive()
q.Save()
Expand Down Expand Up @@ -159,14 +240,74 @@ func checkCommitHashOnTrying(active *queue.AutoMergeQueueItem, info StateChangeI
return true
}

func mergeSucceedItem(
func mergeSucceedItemWithStatusEvent(
ctx context.Context,
client *github.Client,
owner string,
name string,
repoInfo *setting.RepositoryInfo,
q *queue.AutoMergeQueue,
info StatusEventInfo) bool {

active := q.GetActive()

prNum := active.PullRequest

prInfo, _, err := client.PullRequests.Get(ctx, owner, name, prNum)
if err != nil {
log.Println("info: could not fetch the pull request information.")
return false
}

if *prInfo.State != "open" {
log.Printf("info: the pull request #%v has been resolved the state\n", prNum)
return true
}

if info.State != "success" {
log.Println("info: could not merge pull request")

comment := ":collision: The result of what tried to merge this pull request is `" + info.State + "`."
commentStatus(ctx, client, owner, name, prNum, comment, repoInfo.AutoBranchName)

currentLabels := operation.GetLabelsByIssue(ctx, client.Issues, owner, name, prNum)
if currentLabels == nil {
return false
}

labels := operation.AddFailsTestsWithUpsreamLabel(currentLabels)
_, _, err = client.Issues.ReplaceLabelsForIssue(ctx, owner, name, prNum, labels)
if err != nil {
log.Println("warn: could not change labels of the issue")
}

return false
}

comment := ":tada: The result of what tried to merge this pull request is `" + info.State + "`."
commentStatus(ctx, client, owner, name, prNum, comment, repoInfo.AutoBranchName)

if ok := operation.MergePullRequest(ctx, client, owner, name, prInfo, active.PrHead); !ok {
log.Printf("info: cannot merge pull request #%v\n", prNum)
return false
}

if repoInfo.DeleteAfterAutoMerge {
operation.DeleteBranchByPullRequest(ctx, client.Git, prInfo)
}

log.Printf("info: complete merging #%v into master\n", prNum)
return true
}

func mergeSucceedItemWithCheckSuiteEvent(
ctx context.Context,
client *github.Client,
owner string,
name string,
repoInfo *setting.RepositoryInfo,
q *queue.AutoMergeQueue,
info StateChangeInfo) bool {
info CheckSuiteEventInfo) bool {

active := q.GetActive()

Expand All @@ -183,10 +324,15 @@ func mergeSucceedItem(
return true
}

if info.Status != "success" {
if info.Conclusion == "neutral" {
log.Printf("info: Check Status is not determined\n")
return true
}

if info.Conclusion != "success" {
log.Println("info: could not merge pull request")

comment := ":collision: The result of what tried to merge this pull request is `" + info.Status + "`."
comment := ":collision: The result of what tried to merge this pull request is `" + info.Conclusion + "`."
commentStatus(ctx, client, owner, name, prNum, comment, repoInfo.AutoBranchName)

currentLabels := operation.GetLabelsByIssue(ctx, client.Issues, owner, name, prNum)
Expand All @@ -203,7 +349,7 @@ func mergeSucceedItem(
return false
}

comment := ":tada: The result of what tried to merge this pull request is `" + info.Status + "`."
comment := ":tada: The result of what tried to merge this pull request is `" + info.Conclusion + "`."
commentStatus(ctx, client, owner, name, prNum, comment, repoInfo.AutoBranchName)

if ok := operation.MergePullRequest(ctx, client, owner, name, prInfo, active.PrHead); !ok {
Expand Down