fix lint

Author: Zettat123

models/actions/run.go

@@ -226,11 +226,11 @@ func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID strin
 			return cancelledJobs, err
 		}
 
-		if cjs, err := CancelJobs(ctx, jobs); err != nil {
+		cjs, err := CancelJobs(ctx, jobs)
+		if err != nil {
 			return cancelledJobs, err
-		} else {
-			cancelledJobs = append(cancelledJobs, cjs...)
 		}
+		cancelledJobs = append(cancelledJobs, cjs...)
 	}
 
 	// Return nil to indicate successful cancellation of all running and waiting jobs.

models/actions/run_job.go

@@ -259,11 +259,11 @@ func CancelPreviousJobsByConcurrency(ctx context.Context, job *ActionRunJob) ([]
 				return cancelledJobs, fmt.Errorf("find previous jobs: %w", err)
 			}
 			previousJobs = slices.DeleteFunc(previousJobs, func(j *ActionRunJob) bool { return j.ID == job.ID })
-			if cjs, err := CancelJobs(ctx, previousJobs); err != nil {
+			cjs, err := CancelJobs(ctx, previousJobs)
+			if err != nil {
 				return cancelledJobs, fmt.Errorf("cancel previous jobs: %w", err)
-			} else {
-				cancelledJobs = append(cancelledJobs, cjs...)
 			}
+			cancelledJobs = append(cancelledJobs, cjs...)
 		}
 	}
 
@@ -290,11 +290,11 @@ func CancelPreviousJobsByConcurrency(ctx context.Context, job *ActionRunJob) ([]
 			if err != nil {
 				return cancelledJobs, fmt.Errorf("find run %d jobs: %w", run.ID, err)
 			}
-			if cjs, err := CancelJobs(ctx, jobs); err != nil {
+			cjs, err := CancelJobs(ctx, jobs)
+			if err != nil {
 				return cancelledJobs, fmt.Errorf("cancel run %d jobs: %w", run.ID, err)
-			} else {
-				cancelledJobs = append(cancelledJobs, cjs...)
 			}
+			cancelledJobs = append(cancelledJobs, cjs...)
 		}
 	}
 

tests/integration/actions_concurrency_test.go

@@ -805,7 +805,7 @@ jobs:
 		assert.Equal(t, "workflow-group-2", w3Run.ConcurrencyGroup)
 		assert.Equal(t, "concurrent-workflow-3.yml", w3Run.WorkflowID)
 		// push workflow-4
-		opts4 := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", wf4TreePath), wf4FileContent)
+		opts4 := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, "create %s"+wf4TreePath, wf4FileContent)
 		createWorkflowFile(t, token, user2.Name, repo.Name, wf4TreePath, opts4)
 		// exec wf1-job2
 		runner2.execTask(t, w1j2Task, &mockTaskOutcome{