Implement auto-cancellation of concurrent jobs if the event is push

models/actions/run.go

@@ -164,6 +164,60 @@ func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) err
 	return err
 }
 
+// CancelRunningJobs cancels all running jobs of a run
+func CancelRunningJobs(ctx context.Context, run *ActionRun) error {
+	runs, _, err := FindRuns(ctx, FindRunOptions{
+		RepoID: run.RepoID,
+		Ref:    run.Ref,
+		Status: []Status{StatusRunning, StatusWaiting},
+	})
+	if err != nil {
+		return err
+	}
+
+	if len(runs) == 0 {
+		return nil
+	}
+
+	for _, run := range runs {
+		run.Status = StatusCancelled
+		run.Stopped = timeutil.TimeStampNow()
+		if err := UpdateRun(ctx, run, []string{"status", "stopped"}...); err != nil {
+			return err
+		}
+
+		// cancel all running jobs
+		jobs, _, err := FindRunJobs(ctx, FindRunJobOptions{
+			RunID: run.ID,
+		})
+		if err != nil {
+			return err
+		}
+		for _, job := range jobs {
+			status := job.Status
+			if status.IsDone() {
+				continue
+			}
+			if job.TaskID == 0 {
+				job.Status = StatusCancelled
+				job.Stopped = timeutil.TimeStampNow()
+				n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped")
+				if err != nil {
+					return err
+				}
+				if n == 0 {
+					return fmt.Errorf("job has changed, try again")
+				}
+				continue
+			}
+			if err := StopTask(ctx, job.TaskID, StatusCancelled); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 // InsertRun inserts a run
 func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error {
 	ctx, commiter, err := db.TxContext(ctx)

models/actions/run_list.go

@@ -69,9 +69,10 @@ type FindRunOptions struct {
 	RepoID           int64
 	OwnerID          int64
 	WorkflowFileName string
+	Ref              string
 	TriggerUserID    int64
 	Approved         bool // not util.OptionalBool, it works only when it's true
-	Status           Status
+	Status           []Status
 }
 
 func (opts FindRunOptions) toConds() builder.Cond {
@@ -91,8 +92,11 @@ func (opts FindRunOptions) toConds() builder.Cond {
 	if opts.Approved {
 		cond = cond.And(builder.Gt{"approved_by": 0})
 	}
-	if opts.Status > StatusUnknown {
-		cond = cond.And(builder.Eq{"status": opts.Status})
+	if len(opts.Status) > 0 {
+		cond = cond.And(builder.In("status", opts.Status))
+	}
+	if opts.Ref != "" {
+		cond = cond.And(builder.Eq{"ref": opts.Ref})
 	}
 	return cond
 }

routers/web/repo/actions/actions.go

@@ -146,7 +146,7 @@ func List(ctx *context.Context) {
 		RepoID:           ctx.Repo.Repository.ID,
 		WorkflowFileName: workflow,
 		TriggerUserID:    actorID,
-		Status:           actions_model.Status(status),
+		Status:           []actions_model.Status{actions_model.Status(status)},
 	}
 
 	runs, total, err := actions_model.FindRuns(ctx, opts)

services/actions/notifier_helper.go

@@ -232,6 +232,12 @@ func notify(ctx context.Context, input *notifyInput) error {
 			log.Error("jobparser.Parse: %v", err)
 			continue
 		}
+
+		// auto cancel running jobs in the same workflow
+		if err := actions_model.CancelRunningJobs(ctx, run); err != nil {
+			log.Error("CancelRunningJobs: %v", err)
+		}
+
 		if err := actions_model.InsertRun(ctx, run, jobs); err != nil {
 			log.Error("InsertRun: %v", err)
 			continue