fixes

Author: Zettat123

models/actions/run.go

@@ -303,15 +303,15 @@ func InsertRun(ctx context.Context, run *ActionRun, runJobs []*ActionRunJob) err
 				return err
 			}
 		} else {
-			waitingConcurrentRunsNum, err := db.Count[ActionRun](ctx, &FindRunOptions{
+			runningConcurrentRunsNum, err := db.Count[ActionRun](ctx, &FindRunOptions{
 				RepoID:           run.RepoID,
 				ConcurrencyGroup: run.ConcurrencyGroup,
-				Status:           []Status{StatusWaiting},
+				Status:           []Status{StatusRunning},
 			})
 			if err != nil {
 				return err
 			}
-			blockedByWorkflowConcurrency = waitingConcurrentRunsNum > 0
+			blockedByWorkflowConcurrency = runningConcurrentRunsNum > 0
 		}
 	}
 	if blockedByWorkflowConcurrency {
@@ -336,6 +336,7 @@ func InsertRun(ctx context.Context, run *ActionRun, runJobs []*ActionRunJob) err
 
 	var hasWaiting bool
 	for _, job := range runJobs {
+		job.RunID = run.ID
 		if job.Status != StatusBlocked {
 			if blockedByWorkflowConcurrency {
 				// the job should also be blocked when the run is blocked

services/actions/concurrency.go

@@ -50,7 +50,6 @@ func PrepareConcurrencyForRunAndJobs(ctx context.Context, wfContent []byte, run
 		}
 		job.Name, _ = util.SplitStringAtByteN(job.Name, 255)
 		runJob := &actions_model.ActionRunJob{
-			RunID:             run.ID,
 			RepoID:            run.RepoID,
 			OwnerID:           run.OwnerID,
 			CommitSHA:         run.CommitSHA,