Skip to content

Fix required contexts and commit status matching bug #34815

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 4 commits into from
Jun 22, 2025
Merged

Fix required contexts and commit status matching bug #34815

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a5b405
fix matching
Zettat123 Jun 22, 2025
896f53d
Merge branch 'main' into bugfix/issue-34504
wxiaoguang Jun 22, 2025
dc4eb74
Apply suggestions from code review
Zettat123 Jun 22, 2025
8af7b20
Merge branch 'main' into bugfix/issue-34504
GiteaBot Jun 22, 2025
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
9 changes: 7 additions & 2 deletions services/pull/commit_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,25 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
}

requiredCommitStatuses := make([]*git_model.CommitStatus, 0, len(commitStatuses))
allRequiredContextsMatched := true
for _, gp := range requiredContextsGlob {
requiredContextMatched := false
for _, commitStatus := range commitStatuses {
if gp.Match(commitStatus.Context) {
requiredCommitStatuses = append(requiredCommitStatuses, commitStatus)
break
requiredContextMatched = true
}
}
if !requiredContextMatched {
allRequiredContextsMatched = false
}
}
if len(requiredCommitStatuses) == 0 {
return commitstatus.CommitStatusPending
}

returnedStatus := git_model.CalcCommitStatus(requiredCommitStatuses).State
if len(requiredCommitStatuses) == len(requiredContexts) {
if allRequiredContextsMatched {
return returnedStatus
}

Expand Down
9 changes: 9 additions & 0 deletions services/pull/commit_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ func TestMergeRequiredContextsCommitStatus(t *testing.T) {
requiredContexts: []string{"Build*", "Build 2t*"},
expected: commitstatus.CommitStatusFailure,
},
{
commitStatuses: []*git_model.CommitStatus{
{Context: "Build 1", State: commitstatus.CommitStatusSuccess},
{Context: "Build 2", State: commitstatus.CommitStatusSuccess},
{Context: "Build 2t", State: commitstatus.CommitStatusFailure},
},
requiredContexts: []string{"Build*"},
expected: commitstatus.CommitStatusFailure,
},
{
commitStatuses: []*git_model.CommitStatus{
{Context: "Build 1", State: commitstatus.CommitStatusSuccess},
Expand Down