tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-12 08:25:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

notifier ==> notify_service to align with the codebase

Browse Source
This commit is contained in:
Christopher Homberger 2025-03-05 12:59:13 +01:00
parent 071a28c6b8
commit 0c3b0fcf17
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/api/actions/runner/runner.go
View File

@ -15,7 +15,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
actions_service "code.gitea.io/gitea/services/actions" actions_service "code.gitea.io/gitea/services/actions"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1" runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
@ -221,7 +221,7 @@ func (s *Service) UpdateTask(
} }
if task.Status.IsDone() { if task.Status.IsDone() {
notifier.WorkflowJobStatusUpdate(ctx, task.Job.Run.Repo, task.Job.Run.TriggerUser, task.Job, task) notify_service.WorkflowJobStatusUpdate(ctx, task.Job.Run.Repo, task.Job.Run.TriggerUser, task.Job, task)
} }
if req.Msg.State.Result != runnerv1.Result_RESULT_UNSPECIFIED { if req.Msg.State.Result != runnerv1.Result_RESULT_UNSPECIFIED {

8
routers/web/repo/actions/view.go
View File

@ -33,7 +33,7 @@ import (
"code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web"
actions_service "code.gitea.io/gitea/services/actions" actions_service "code.gitea.io/gitea/services/actions"
context_module "code.gitea.io/gitea/services/context" context_module "code.gitea.io/gitea/services/context"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
"github.com/nektos/act/pkg/model" "github.com/nektos/act/pkg/model"
"xorm.io/builder" "xorm.io/builder"
@ -460,7 +460,7 @@ func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shou
actions_service.CreateCommitStatus(ctx, job) actions_service.CreateCommitStatus(ctx, job)
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
return nil return nil
} }
@ -559,7 +559,7 @@ func Cancel(ctx *context_module.Context) {
for _, job := range updatedjobs { for _, job := range updatedjobs {
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
} }
ctx.JSON(http.StatusOK, struct{}{}) ctx.JSON(http.StatusOK, struct{}{})
@ -605,7 +605,7 @@ func Approve(ctx *context_module.Context) {
for _, job := range updatedjobs { for _, job := range updatedjobs {
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
} }
ctx.JSON(http.StatusOK, struct{}{}) ctx.JSON(http.StatusOK, struct{}{})

6
services/actions/clear_tasks.go
View File

@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
) )
// StopZombieTasks stops the task which have running status, but haven't been updated for a long time // StopZombieTasks stops the task which have running status, but haven't been updated for a long time
@ -71,7 +71,7 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error {
CreateCommitStatus(ctx, jobs...) CreateCommitStatus(ctx, jobs...)
for _, job := range jobs { for _, job := range jobs {
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
} }
return nil return nil
} }
@ -103,7 +103,7 @@ func CancelAbandonedJobs(ctx context.Context) error {
CreateCommitStatus(ctx, job) CreateCommitStatus(ctx, job)
if updated { if updated {
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
} }
} }

4
services/actions/job_emitter.go
View File

@ -12,7 +12,7 @@ import (
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/queue" "code.gitea.io/gitea/modules/queue"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
"github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/jobparser"
"xorm.io/builder" "xorm.io/builder"
@ -76,7 +76,7 @@ func checkJobsOfRun(ctx context.Context, runID int64) error {
CreateCommitStatus(ctx, jobs...) CreateCommitStatus(ctx, jobs...)
for _, job := range updatedjobs { for _, job := range updatedjobs {
_ = job.LoadAttributes(ctx) _ = job.LoadAttributes(ctx)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
} }
return nil return nil
} }

4
services/actions/notifier_helper.go
View File

@ -27,7 +27,7 @@ import (
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
webhook_module "code.gitea.io/gitea/modules/webhook" webhook_module "code.gitea.io/gitea/modules/webhook"
"code.gitea.io/gitea/services/convert" "code.gitea.io/gitea/services/convert"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
"github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/jobparser"
"github.com/nektos/act/pkg/model" "github.com/nektos/act/pkg/model"
@ -365,7 +365,7 @@ func handleWorkflows(
} }
CreateCommitStatus(ctx, alljobs...) CreateCommitStatus(ctx, alljobs...)
for _, job := range alljobs { for _, job := range alljobs {
notifier.WorkflowJobStatusUpdate(ctx, input.Repo, input.Doer, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, input.Repo, input.Doer, job, nil)
} }
} }
return nil return nil

4
services/actions/schedule_tasks.go
View File

@ -15,7 +15,7 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
webhook_module "code.gitea.io/gitea/modules/webhook" webhook_module "code.gitea.io/gitea/modules/webhook"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
"github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/jobparser"
) )
@ -158,7 +158,7 @@ func CreateScheduleTask(ctx context.Context, cron *actions_model.ActionSchedule)
log.Error("LoadAttributes: %v", err) log.Error("LoadAttributes: %v", err)
} }
for _, job := range allJobs { for _, job := range allJobs {
notifier.WorkflowJobStatusUpdate(ctx, run.Repo, run.TriggerUser, job, nil) notify_service.WorkflowJobStatusUpdate(ctx, run.Repo, run.TriggerUser, job, nil)
} }
// Return nil if no errors occurred // Return nil if no errors occurred

4
services/actions/task.go
View File

@ -10,7 +10,7 @@ import (
actions_model "code.gitea.io/gitea/models/actions" actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
secret_model "code.gitea.io/gitea/models/secret" secret_model "code.gitea.io/gitea/models/secret"
notifier "code.gitea.io/gitea/services/notify" notify_service "code.gitea.io/gitea/services/notify"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1" runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
@ -77,7 +77,7 @@ func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv
} }
CreateCommitStatus(ctx, job) CreateCommitStatus(ctx, job)
notifier.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, actionTask) notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, actionTask)
return task, true, nil return task, true, nil
} }