tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

fix: commit status

Browse Source
This commit is contained in:
Jason Song
2022-11-29 18:48:00 +08:00
parent 564937a657
commit 3793d55eca
5 changed files with 73 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/bots/runner/runner.go
+1 -4
View File
@@ -172,11 +172,8 @@ func (s *Service) UpdateTask(
if err := task.LoadJob(ctx); err != nil {
return nil, status.Errorf(codes.Internal, "load job: %v", err)
}
if err := task.Job.LoadAttributes(ctx); err != nil {
return nil, status.Errorf(codes.Internal, "load run: %v", err)
}
if err := bots_service.CreateCommitStatus(ctx, task); err != nil {
if err := bots_service.CreateCommitStatus(ctx, task.Job); err != nil {
log.Error("Update commit status failed: %v", err)
// go on
}
routers/web/repo/bots/view.go
+8 -2
View File
@@ -16,6 +16,7 @@ import (
context_module "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/web"
bots_service "code.gitea.io/gitea/services/bots"
runnerv1 "code.gitea.io/bots-proto-go/runner/v1"
"xorm.io/builder"
@@ -211,8 +212,10 @@ func Rerun(ctx *context_module.Context) {
job.Stopped = 0
if err := db.WithTx(ctx, func(ctx context.Context) error {
_, err := bots_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped")
return err
if _, err := bots_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped"); err != nil {
return err
}
return bots_service.CreateCommitStatus(ctx, job)
}); err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
@@ -250,6 +253,9 @@ func Cancel(ctx *context_module.Context) {
if err := bots_model.StopTask(ctx, job.TaskID, bots_model.StatusCancelled); err != nil {
return err
}
if err := bots_service.CreateCommitStatus(ctx, job); err != nil {
return err
}
}
return nil
}); err != nil {