fix

Author: Zettat123

models/actions/run.go

@@ -369,7 +369,7 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 type ActionRunIndex db.ResourceIndex
 
 func ShouldBlockRunByConcurrency(ctx context.Context, actionRun *ActionRun) (bool, error) {
-	if actionRun.ConcurrencyGroup != "" || actionRun.ConcurrencyCancel {
+	if actionRun.ConcurrencyGroup == "" || actionRun.ConcurrencyCancel {
 		return false, nil
 	}
 

models/actions/run_job.go

@@ -193,7 +193,7 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status {
 }
 
 func ShouldBlockJobByConcurrency(ctx context.Context, job *ActionRunJob) (bool, error) {
-	if job.RawConcurrencyGroup != "" {
+	if job.RawConcurrencyGroup == "" {
 		return false, nil
 	}
 	if !job.IsConcurrencyEvaluated {
@@ -202,7 +202,7 @@ func ShouldBlockJobByConcurrency(ctx context.Context, job *ActionRunJob) (bool,
 			CancelInProgress: job.RawConcurrencyCancel,
 		}
 	}
-	if job.ConcurrencyGroup != "" || job.ConcurrencyCancel {
+	if job.ConcurrencyGroup == "" || job.ConcurrencyCancel {
 		return false, nil
 	}
 

routers/web/repo/actions/view.go

@@ -944,7 +944,7 @@ func Run(ctx *context_module.Context) {
 			ctx.ServerError("GetVariablesOfRun", err)
 			return
 		}
-		wfConcurrencyGroup, wfConcurrencyCancel, err := actions_service.EvaluateWorkflowConcurrency(run, wfRawConcurrency, vars)
+		wfConcurrencyGroup, wfConcurrencyCancel, err := actions_service.EvaluateWorkflowConcurrency(ctx, run, wfRawConcurrency, vars)
 		if err != nil {
 			ctx.ServerError("EvaluateWorkflowConcurrency", err)
 			return
@@ -955,17 +955,6 @@ func Run(ctx *context_module.Context) {
 		}
 	}
 
-	// cancel running jobs of the same workflow
-	if err := actions_model.CancelPreviousJobs(
-		ctx,
-		run.RepoID,
-		run.Ref,
-		run.WorkflowID,
-		run.Event,
-	); err != nil {
-		log.Error("CancelRunningJobs: %v", err)
-	}
-
 	// Insert the action run and its associated jobs into the database
 	if err := actions_service.InsertRun(ctx, run, workflows); err != nil {
 		ctx.ServerError("workflow", err)

services/actions/concurrency.go

@@ -4,6 +4,7 @@
 package actions
 
 import (
+	"context"
 	"fmt"
 
 	actions_model "code.gitea.io/gitea/models/actions"
@@ -14,7 +15,10 @@ import (
 	act_model "github.com/nektos/act/pkg/model"
 )
 
-func EvaluateWorkflowConcurrency(run *actions_model.ActionRun, rc *act_model.RawConcurrency, vars map[string]string) (string, bool, error) {
+func EvaluateWorkflowConcurrency(ctx context.Context, run *actions_model.ActionRun, rc *act_model.RawConcurrency, vars map[string]string) (string, bool, error) {
+	if err := run.LoadAttributes(ctx); err != nil {
+		return "", false, fmt.Errorf("run LoadAttributes: %w", err)
+	}
 	gitCtx := jobparser.ToGitContext(GenerateGiteaContext(run, nil))
 	jobResults := map[string]*jobparser.JobResult{"": {}}
 	inputs, err := getInputsFromRun(run)

services/actions/notifier_helper.go

@@ -338,7 +338,7 @@ func handleWorkflows(
 			continue
 		}
 		if wfRawConcurrency != nil {
-			wfConcurrencyGroup, wfConcurrencyCancel, err := EvaluateWorkflowConcurrency(run, wfRawConcurrency, vars)
+			wfConcurrencyGroup, wfConcurrencyCancel, err := EvaluateWorkflowConcurrency(ctx, run, wfRawConcurrency, vars)
 			if err != nil {
 				log.Error("EvaluateWorkflowConcurrency: %v", err)
 				continue

services/actions/schedule_tasks.go

@@ -148,7 +148,7 @@ func CreateScheduleTask(ctx context.Context, cron *actions_model.ActionSchedule)
 		return err
 	}
 	if wfRawConcurrency != nil {
-		wfConcurrencyGroup, wfConcurrencyCancel, err := EvaluateWorkflowConcurrency(run, wfRawConcurrency, vars)
+		wfConcurrencyGroup, wfConcurrencyCancel, err := EvaluateWorkflowConcurrency(ctx, run, wfRawConcurrency, vars)
 		if err != nil {
 			return err
 		}