fix

Author: Zettat123

models/actions/run_job.go

@@ -197,7 +197,7 @@ func ShouldBlockJobByConcurrency(ctx context.Context, job *ActionRunJob) (bool,
 		return false, nil
 	}
 	if !job.IsConcurrencyEvaluated {
-		return false, fmt.Errorf("the raw concurrency group has not been evaluated")
+		return false, ErrUnevaluatedConcurrency{}
 	}
 	if len(job.ConcurrencyGroup) == 0 || job.ConcurrencyCancel {
 		return false, nil
@@ -225,7 +225,7 @@ func ShouldBlockJobByConcurrency(ctx context.Context, job *ActionRunJob) (bool,
 func CancelPreviousJobsByConcurrency(ctx context.Context, job *ActionRunJob) error {
 	if len(job.RawConcurrencyGroup) > 0 {
 		if !job.IsConcurrencyEvaluated {
-			return fmt.Errorf("the raw concurrency group has not been evaluated")
+			return ErrUnevaluatedConcurrency{}
 		}
 		if len(job.ConcurrencyGroup) > 0 && job.ConcurrencyCancel {
 			// cancel previous jobs in the same concurrency group
@@ -274,3 +274,15 @@ func CancelPreviousJobsByConcurrency(ctx context.Context, job *ActionRunJob) err
 
 	return nil
 }
+
+type ErrUnevaluatedConcurrency struct {
+}
+
+func IsErrUnevaluatedConcurrency(err error) bool {
+	_, ok := err.(ErrUnevaluatedConcurrency)
+	return ok
+}
+
+func (err ErrUnevaluatedConcurrency) Error() string {
+	return "the raw concurrency group has not been evaluated"
+}

routers/web/repo/actions/view.go

@@ -562,6 +562,9 @@ func Approve(ctx *context_module.Context) {
 		for _, job := range jobs {
 			blockJobByConcurrency, err := actions_model.ShouldBlockJobByConcurrency(ctx, job)
 			if err != nil {
+				if actions_model.IsErrUnevaluatedConcurrency(err) {
+					continue
+				}
 				return err
 			}
 			if len(job.Needs) == 0 && job.Status.IsBlocked() && !blockJobByConcurrency {