fix test

Author: Zettat123

services/actions/clear_tasks.go

@@ -57,7 +57,7 @@ func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository) er
 	return err
 }
 
-func CancelConcurrentJobs(ctx context.Context, job *actions_model.ActionRunJob) error {
+func CancelJobs(ctx context.Context, job *actions_model.ActionRunJob) error {
 	jobs, err := actions_model.CancelPreviousJobsByConcurrency(ctx, job)
 	notifyWorkflowJobStatusUpdate(ctx, jobs)
 	return err

services/actions/job_emitter.go

@@ -53,10 +53,14 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 	if err != nil {
 		return fmt.Errorf("get action run: %w", err)
 	}
+	var jobs, updatedJobs []*actions_model.ActionRunJob
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
 		// check jobs of the current run
-		if err := checkJobsOfRun(ctx, run); err != nil {
+		if js, ujs, err := checkJobsOfRun(ctx, run); err != nil {
 			return err
+		} else {
+			jobs = append(jobs, js...)
+			updatedJobs = append(updatedJobs, ujs...)
 		}
 		// check run (workflow-level) concurrency
 		concurrentRunIDs := make(container.Set[int64])
@@ -78,8 +82,11 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 				if concurrentRun.NeedApproval {
 					continue
 				}
-				if err := checkJobsOfRun(ctx, concurrentRun); err != nil {
+				if js, ujs, err := checkJobsOfRun(ctx, concurrentRun); err != nil {
 					return err
+				} else {
+					jobs = append(jobs, js...)
+					updatedJobs = append(updatedJobs, ujs...)
 				}
 				updatedRun, err := actions_model.GetRunByID(ctx, concurrentRun.ID)
 				if err != nil {
@@ -128,8 +135,11 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 						if concurrentRun.NeedApproval {
 							continue
 						}
-						if err := checkJobsOfRun(ctx, concurrentRun); err != nil {
+						if js, ujs, err := checkJobsOfRun(ctx, concurrentRun); err != nil {
 							return err
+						} else {
+							jobs = append(jobs, js...)
+							updatedJobs = append(updatedJobs, ujs...)
 						}
 						updatedJob, err := actions_model.GetRunJobByID(ctx, concurrentJob.ID)
 						if err != nil {
@@ -142,27 +152,29 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 				}
 			}
 		}
-
 		return nil
 	}); err != nil {
 		return err
 	}
-
+	CreateCommitStatus(ctx, jobs...)
+	for _, job := range updatedJobs {
+		_ = job.LoadAttributes(ctx)
+		notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
+	}
 	return nil
 }
 
-func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) error {
-	jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: run.ID})
+func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) (jobs, updatedJobs []*actions_model.ActionRunJob, err error) {
+	jobs, err = db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: run.ID})
 	if err != nil {
-		return err
+		return
 	}
-	var updatedjobs []*actions_model.ActionRunJob
 	vars, err := actions_model.GetVariablesOfRun(ctx, run)
 	if err != nil {
-		return fmt.Errorf("get run %d variables: %w", run.ID, err)
+		return
 	}
 
-	if err := db.WithTx(ctx, func(ctx context.Context) error {
+	if err = db.WithTx(ctx, func(ctx context.Context) error {
 		for _, job := range jobs {
 			job.Run = run
 		}
@@ -176,19 +188,15 @@ func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) error {
 				} else if n != 1 {
 					return fmt.Errorf("no affected for updating blocked job %v", job.ID)
 				}
-				updatedjobs = append(updatedjobs, job)
+				updatedJobs = append(updatedJobs, job)
 			}
 		}
 		return nil
 	}); err != nil {
-		return err
-	}
-	CreateCommitStatus(ctx, jobs...)
-	for _, job := range updatedjobs {
-		_ = job.LoadAttributes(ctx)
-		notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
+		return
 	}
-	return nil
+
+	return
 }
 
 type jobStatusResolver struct {

services/actions/task.go

@@ -53,8 +53,8 @@ func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv
 			return nil
 		}
 
-		if err := CancelConcurrentJobs(ctx, t.Job); err != nil {
-			return fmt.Errorf("CancelConcurrentJobs: %w", err)
+		if err := CancelJobs(ctx, t.Job); err != nil {
+			return fmt.Errorf("CancelJobs: %w", err)
 		}
 
 		if err := t.LoadAttributes(ctx); err != nil {

tests/integration/actions_concurrency_test.go

@@ -224,7 +224,7 @@ jobs:
 			},
 			ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix")),
 		})(t)
-		doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+"%s:bugfix/bbb")(t)
+		doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":bugfix/bbb")(t)
 		// cannot fetch the task because an approval is required
 		runner.fetchNoTask(t)
 		// user2 approves the run
@@ -264,7 +264,7 @@ jobs:
 			},
 			ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix2")),
 		})(t)
-		doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+"%s:do-not-cancel/ccc")(t)
+		doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, user4.Name+":do-not-cancel/ccc")(t)
 		// cannot fetch the task because cancel-in-progress is false
 		runner.fetchNoTask(t)
 		runner.execTask(t, pr2Task1, &mockTaskOutcome{