chore: golang lint

models/bots/run.go

@@ -6,7 +6,6 @@ package bots
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -14,6 +13,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/models/webhook"
+	"code.gitea.io/gitea/modules/json"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 

models/bots/run_job_list.go

@@ -52,10 +52,7 @@ func (jobs RunJobList) LoadRuns(ctx context.Context, withRepo bool) error {
 }
 
 func (jobs RunJobList) LoadAttributes(ctx context.Context, withRepo bool) error {
-	if err := jobs.LoadRuns(ctx, withRepo); err != nil {
-		return err
-	}
-	return nil
+	return jobs.LoadRuns(ctx, withRepo)
 }
 
 type FindRunJobOptions struct {

models/bots/task.go

@@ -317,7 +317,8 @@ func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, erro
 
 	// TODO: a more efficient way to filter labels
 	var job *RunJob
-	labels := append(runner.AgentLabels, runner.CustomLabels...)
+	labels := runner.AgentLabels
+	labels = append(labels, runner.CustomLabels...)
 	log.Trace("runner labels: %v", labels)
 	for _, v := range jobs {
 		if isSubset(labels, v.RunsOn) {

models/bots/task_list.go

@@ -50,10 +50,7 @@ func (tasks TaskList) LoadJobs(ctx context.Context) error {
 }
 
 func (tasks TaskList) LoadAttributes(ctx context.Context) error {
-	if err := tasks.LoadJobs(ctx); err != nil {
-		return err
-	}
-	return nil
+	return tasks.LoadJobs(ctx)
 }
 
 type FindTaskOptions struct {