fix CreateCommitStatus

Author: Zettat123

services/actions/job_emitter.go

@@ -53,14 +53,19 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 		return fmt.Errorf("get action run: %w", err)
 	}
 
-	return db.WithTx(ctx, func(ctx context.Context) error {
+	var jobsToCreateCommitStatus []*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 jobs, err := checkJobsOfRun(ctx, run); err != nil {
 			return err
+		} else {
+			jobsToCreateCommitStatus = append(jobsToCreateCommitStatus, jobs...)
 		}
 
 		// check run (workflow-level) concurrency
 		concurrentRunIDs := make(container.Set[int64])
+		concurrentRunIDs.Add(run.ID)
 		if run.ConcurrencyGroup != "" {
 			concurrentRuns, err := db.Find[actions_model.ActionRun](ctx, actions_model.FindRunOptions{
 				RepoID:           run.RepoID,
@@ -71,12 +76,17 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 				return err
 			}
 			for _, concurrentRun := range concurrentRuns {
+				if concurrentRunIDs.Contains(concurrentRun.ID) {
+					continue
+				}
 				concurrentRunIDs.Add(concurrentRun.ID)
 				if concurrentRun.NeedApproval {
 					continue
 				}
-				if err := checkJobsOfRun(ctx, concurrentRun); err != nil {
+				if jobs, err := checkJobsOfRun(ctx, concurrentRun); err != nil {
 					return err
+				} else {
+					jobsToCreateCommitStatus = append(jobsToCreateCommitStatus, jobs...)
 				}
 				updatedRun, err := actions_model.GetRunByID(ctx, concurrentRun.ID)
 				if err != nil {
@@ -108,15 +118,18 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 					if concurrentRunIDs.Contains(concurrentJob.RunID) {
 						continue
 					}
+					concurrentRunIDs.Add(concurrentJob.RunID)
 					concurrentRun, err := actions_model.GetRunByID(ctx, concurrentJob.RunID)
 					if err != nil {
 						return err
 					}
 					if concurrentRun.NeedApproval {
 						continue
 					}
-					if err := checkJobsOfRun(ctx, concurrentRun); err != nil {
+					if jobs, err := checkJobsOfRun(ctx, concurrentRun); err != nil {
 						return err
+					} else {
+						jobsToCreateCommitStatus = append(jobsToCreateCommitStatus, jobs...)
 					}
 					updatedJob, err := actions_model.GetRunJobByID(ctx, concurrentJob.ID)
 					if err != nil {
@@ -130,18 +143,24 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 		}
 
 		return nil
-	})
+	}); err != nil {
+		return err
+	}
+
+	CreateCommitStatus(ctx, jobsToCreateCommitStatus...)
+
+	return nil
 }
 
-func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) error {
+func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) ([]*actions_model.ActionRunJob, error) {
 	jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: run.ID})
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	vars, err := actions_model.GetVariablesOfRun(ctx, run)
 	if err != nil {
-		return fmt.Errorf("get run %d variables: %w", run.ID, err)
+		return nil, fmt.Errorf("get run %d variables: %w", run.ID, err)
 	}
 
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
@@ -162,10 +181,9 @@ func checkJobsOfRun(ctx context.Context, run *actions_model.ActionRun) error {
 		}
 		return nil
 	}); err != nil {
-		return err
+		return nil, err
 	}
-	CreateCommitStatus(ctx, jobs...)
-	return nil
+	return jobs, nil
 }
 
 type jobStatusResolver struct {