update

Author: NorthRealm

services/actions/clear_tasks.go

@@ -134,18 +134,23 @@ func CancelAbandonedJobs(ctx context.Context) error {
 		}
 	}
 
-	for _, job := range updatedRuns {
-		c, err := db.Count[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{
-			RunID:    job.RunID,
-			Statuses: []actions_model.Status{actions_model.StatusWaiting, actions_model.StatusBlocked, actions_model.StatusRunning},
-		})
+	for runid, job := range updatedRuns {
+		jobs, err := actions_model.GetRunJobsByRunID(ctx, runid)
 		if err != nil {
-			log.Error("Count waiting jobs for run %d: %v", job.RunID, err)
+			log.Error("Count waiting jobs for run %d: %v", runid, err)
 			continue
 		}
-		if c == 0 {
-			NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
+		unfinished := false
+		for _, job := range jobs {
+			if !job.Status.IsDone() {
+				unfinished = true
+				break
+			}
+		}
+		if unfinished {
+			continue
 		}
+		NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 	}
 
 	return nil