From d8505a949d61c19875619fae4b1eaf0d55c21a5a Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 8 Apr 2024 21:15:23 +0800
Subject: [PATCH] Fix create commit status (#30225)
Partially backport #30223
This PR uses the service layer `CreateCommitstatus` method instead of
the git model method.
---
services/actions/commit_status.go | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go
index 4236553927..887fa9fb7b 100644
--- a/services/actions/commit_status.go
+++ b/services/actions/commit_status.go
@@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
webhook_module "code.gitea.io/gitea/modules/webhook"
+ commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus"
"github.com/nektos/act/pkg/jobparser"
)
@@ -122,19 +123,16 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
if err != nil {
return fmt.Errorf("HashTypeInterfaceFromHashString: %w", err)
}
- if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{
- Repo: repo,
- SHA: commitID,
- Creator: creator,
- CommitStatus: &git_model.CommitStatus{
+ if err := commitstatus_service.CreateCommitStatus(ctx, repo, creator,
+ commitID.String(),
+ &git_model.CommitStatus{
SHA: sha,
TargetURL: fmt.Sprintf("%s/jobs/%d", run.Link(), index),
Description: description,
Context: ctxname,
CreatorID: creator.ID,
State: state,
- },
- }); err != nil {
+ }); err != nil {
return fmt.Errorf("NewCommitStatus: %w", err)
}