Some improvements

This commit is contained in:
Lunny Xiao committed 2025-05-25 12:39:38 -07:00
1 parent 43ed136609
commit 083e0ba97a
10 files changed
+40 -38

No files matched your search

+3 -1
View File
@@ -5,6 +5,7 @@ package convert
import (
"context"
"net/url"
git_model "code.gitea.io/gitea/models/git"
user_model "code.gitea.io/gitea/models/user"
@@ -44,6 +45,7 @@ func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, r
SHA: combinedStatus.SHA,
TotalCount: len(statuses),
Repository: repo,
URL: combinedStatus.TargetURL,
CommitURL: repo.URL + "/commits/" + url.PathEscape(combinedStatus.SHA),
URL: repo.URL + "/commits/" + url.PathEscape(combinedStatus.SHA) + "/status",
}
}
+1 -1
View File
@@ -51,7 +51,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
func IsCommitStatusContextSuccess(commitStatuses []*git_model.CommitStatus, requiredContexts []string) bool {
// If no specific context is required, require that last commit status is a success
if len(requiredContexts) == 0 {
return git_model.CalcCombinedStatusState(commitStatuses) == commitstatus.CombinedStatusStateSuccess
return git_model.CalcCombinedStatusState(commitStatuses) == commitstatus.CombinedStatusSuccess
}
for _, ctx := range requiredContexts {
+5 -5
View File
@@ -50,11 +50,11 @@ func TestMergeRequiredContextsCommitStatus(t *testing.T) {
}
testCasesExpected := []commitstatus.CombinedStatusState{
commitstatus.CombinedStatusStateSuccess,
commitstatus.CombinedStatusStatePending,
commitstatus.CombinedStatusStateFailure,
commitstatus.CombinedStatusStatePending,
commitstatus.CombinedStatusStateSuccess,
commitstatus.CombinedStatusSuccess,
commitstatus.CombinedStatusPending,
commitstatus.CombinedStatusFailure,
commitstatus.CombinedStatusPending,
commitstatus.CombinedStatusSuccess,
}
for i, commitStatuses := range testCases {
@@ -99,7 +99,7 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato
return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err)
}
return git_model.UpdateCommitStatusSummary(ctx, repo.ID, commit.ID.String())
return git_model.InsertOrUpdateCombinedStatus(ctx, repo.ID, commit.ID.String())
}); err != nil {
return err
}