fix nil ptr

Author: Zettat123

services/actions/concurrency.go

@@ -70,7 +70,7 @@ func PrepareConcurrencyForRunAndJobs(ctx context.Context, wfContent []byte, run
 			// because it will be checked by job emitter
 			if runJob.Status != actions_model.StatusBlocked && len(needs) == 0 {
 				var err error
-				runJob.ConcurrencyGroup, runJob.ConcurrencyCancel, err = evaluateJobConcurrency(ctx, runJob, vars, map[string]*jobparser.JobResult{})
+				runJob.ConcurrencyGroup, runJob.ConcurrencyCancel, err = evaluateJobConcurrency(run, runJob, vars, map[string]*jobparser.JobResult{})
 				if err != nil {
 					return nil, fmt.Errorf("evaluate job concurrency: %w", err)
 				}
@@ -83,12 +83,7 @@ func PrepareConcurrencyForRunAndJobs(ctx context.Context, wfContent []byte, run
 	return runJobs, nil
 }
 
-func evaluateJobConcurrency(ctx context.Context, actionRunJob *actions_model.ActionRunJob, vars map[string]string, jobResults map[string]*jobparser.JobResult) (string, bool, error) {
-	if err := actionRunJob.LoadRun(ctx); err != nil {
-		return "", false, err
-	}
-	run := actionRunJob.Run
-
+func evaluateJobConcurrency(run *actions_model.ActionRun, actionRunJob *actions_model.ActionRunJob, vars map[string]string, jobResults map[string]*jobparser.JobResult) (string, bool, error) {
 	rawConcurrency := &act_model.RawConcurrency{
 		Group:            actionRunJob.RawConcurrencyGroup,
 		CancelInProgress: actionRunJob.RawConcurrencyCancel,
@@ -102,7 +97,11 @@ func evaluateJobConcurrency(ctx context.Context, actionRunJob *actions_model.Act
 	}
 	actJob := actWorkflow.GetJob(actionRunJob.JobID)
 
-	concurrencyGroup, concurrencyCancel := jobparser.EvaluateJobConcurrency(rawConcurrency, actJob, gitCtx, vars, jobResults)
+	if len(jobResults) == 0 {
+		jobResults = map[string]*jobparser.JobResult{actionRunJob.JobID: {}}
+	}
+
+	concurrencyGroup, concurrencyCancel := jobparser.EvaluateJobConcurrency(rawConcurrency, actionRunJob.JobID, actJob, gitCtx, vars, jobResults)
 
 	return concurrencyGroup, concurrencyCancel, nil
 }

services/actions/job_emitter.go

@@ -227,6 +227,9 @@ func checkJobConcurrency(ctx context.Context, actionRunJob *actions_model.Action
 	if len(actionRunJob.RawConcurrencyGroup) == 0 {
 		return false, nil
 	}
+	if err := actionRunJob.LoadRun(ctx); err != nil {
+		return false, err
+	}
 
 	if len(actionRunJob.ConcurrencyGroup) == 0 {
 		// empty concurrency group means the raw concurrency has not been evaluated
@@ -247,7 +250,7 @@ func checkJobConcurrency(ctx context.Context, actionRunJob *actions_model.Action
 			jobResults[jobID] = jobResult
 		}
 
-		actionRunJob.ConcurrencyGroup, actionRunJob.ConcurrencyCancel, err = evaluateJobConcurrency(ctx, actionRunJob, vars, jobResults)
+		actionRunJob.ConcurrencyGroup, actionRunJob.ConcurrencyCancel, err = evaluateJobConcurrency(actionRunJob.Run, actionRunJob, vars, jobResults)
 		if err != nil {
 			return false, fmt.Errorf("evaluate job concurrency: %w", err)
 		}