Skip to content

Commit 7f7cbef

Browse files
committed
Fix create commit status (go-gitea#30225)
Partially backport go-gitea#30223 This PR uses the service layer `CreateCommitstatus` method instead of the git model method.
1 parent 4588c7b commit 7f7cbef

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

services/actions/commit_status.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import (
1212
"code.gitea.io/gitea/models/db"
1313
git_model "code.gitea.io/gitea/models/git"
1414
user_model "code.gitea.io/gitea/models/user"
15+
"code.gitea.io/gitea/modules/git"
1516
"code.gitea.io/gitea/modules/log"
1617
api "code.gitea.io/gitea/modules/structs"
1718
webhook_module "code.gitea.io/gitea/modules/webhook"
19+
commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus"
1820

1921
"github.com/nektos/act/pkg/jobparser"
2022
)
@@ -114,19 +116,20 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
114116
}
115117

116118
creator := user_model.NewActionsUser()
117-
if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{
118-
Repo: repo,
119-
SHA: sha,
120-
Creator: creator,
121-
CommitStatus: &git_model.CommitStatus{
122-
SHA: sha,
119+
commitID, err := git.NewIDFromString(sha)
120+
if err != nil {
121+
return fmt.Errorf("HashTypeInterfaceFromHashString: %w", err)
122+
}
123+
if err := commitstatus_service.CreateCommitStatus(ctx, repo, creator,
124+
commitID.String(),
125+
&git_model.CommitStatus{
126+
SHA: commitID.String(),
123127
TargetURL: fmt.Sprintf("%s/jobs/%d", run.Link(), index),
124128
Description: description,
125129
Context: ctxname,
126130
CreatorID: creator.ID,
127131
State: state,
128-
},
129-
}); err != nil {
132+
}); err != nil {
130133
return fmt.Errorf("NewCommitStatus: %w", err)
131134
}
132135

0 commit comments

Comments
 (0)