NotifyWorkflowRunStatusUpdateWithReload

Author: wxiaoguang

routers/web/repo/actions/view.go

@@ -485,12 +485,7 @@ func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shou
 	}
 
 	actions_service.CreateCommitStatus(ctx, job)
-	// Sync run status with db
-	job.Run = nil
-	if err := job.LoadAttributes(ctx); err != nil {
-		return err
-	}
-	notify_service.WorkflowRunStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job.Run)
+	actions_service.NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 	notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
 
 	return nil
@@ -564,12 +559,7 @@ func Cancel(ctx *context_module.Context) {
 	}
 	if len(updatedjobs) > 0 {
 		job := updatedjobs[0]
-		// Sync run status with db
-		job.Run = nil
-		if err := job.LoadAttributes(ctx); err != nil {
-			ctx.ServerError("LoadAttributes", err)
-			return
-		}
+		actions_service.NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 		notify_service.WorkflowRunStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job.Run)
 	}
 	ctx.JSON(http.StatusOK, struct{}{})
@@ -615,9 +605,7 @@ func Approve(ctx *context_module.Context) {
 
 	if len(updatedjobs) > 0 {
 		job := updatedjobs[0]
-		// Sync run status with db
-		job.Run = nil
-		_ = job.LoadAttributes(ctx)
+		actions_service.NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 		notify_service.WorkflowRunStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job.Run)
 	}
 

services/actions/clear_tasks.go

@@ -127,11 +127,8 @@ func CancelAbandonedJobs(ctx context.Context) error {
 		}
 		CreateCommitStatus(ctx, job)
 		if updated {
-			// Sync run status with db
-			job.Run = nil
-			_ = job.LoadAttributes(ctx)
+			NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 			notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
-			notify_service.WorkflowRunStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job.Run)
 		}
 	}
 

services/actions/job_emitter.go

@@ -11,6 +11,7 @@ import (
 	actions_model "code.gitea.io/gitea/models/actions"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/graceful"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/queue"
 	notify_service "code.gitea.io/gitea/services/notify"
 
@@ -87,18 +88,21 @@ func checkJobsOfRun(ctx context.Context, runID int64) error {
 			}
 		}
 		if runUpdated {
-			// Sync run status with db
-			jobs[0].Run = nil
-			if err := jobs[0].LoadAttributes(ctx); err != nil {
-				return err
-			}
-			run := jobs[0].Run
-			notify_service.WorkflowRunStatusUpdate(ctx, run.Repo, run.TriggerUser, run)
+			NotifyWorkflowRunStatusUpdateWithReload(ctx, jobs[0])
 		}
 	}
 	return nil
 }
 
+func NotifyWorkflowRunStatusUpdateWithReload(ctx context.Context, job *actions_model.ActionRunJob) {
+	job.Run = nil
+	if err := job.LoadAttributes(ctx); err != nil {
+		log.Error("LoadAttributes: %v", err)
+		return
+	}
+	notify_service.WorkflowRunStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job.Run)
+}
+
 type jobStatusResolver struct {
 	statuses map[int64]actions_model.Status
 	needs    map[int64][]int64