From 825591535055aba5859bcb229e8df502ab260508 Mon Sep 17 00:00:00 2001 From: "Bo-Yi.Wu" Date: Sat, 3 Sep 2022 17:09:40 +0800 Subject: [PATCH] chore: move core package to top folder. Signed-off-by: Bo-Yi.Wu --- {routers/api/bots/core => core}/scheduler.go | 0 {routers/api/bots/core => core}/status.go | 0 models/bots/build.go | 2 +- models/bots/build_stage.go | 2 +- models/bots/build_step.go | 2 +- modules/notification/bots/bots.go | 2 +- routers/api/bots/runner/runner.go | 2 +- routers/api/bots/scheduler/queue/queue.go | 2 +- routers/api/bots/scheduler/queue/scheduler.go | 2 +- routers/api/bots/socket.go | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename {routers/api/bots/core => core}/scheduler.go (100%) rename {routers/api/bots/core => core}/status.go (100%) diff --git a/routers/api/bots/core/scheduler.go b/core/scheduler.go similarity index 100% rename from routers/api/bots/core/scheduler.go rename to core/scheduler.go diff --git a/routers/api/bots/core/status.go b/core/status.go similarity index 100% rename from routers/api/bots/core/status.go rename to core/status.go diff --git a/models/bots/build.go b/models/bots/build.go index f80db0c2e2..5edb396583 100644 --- a/models/bots/build.go +++ b/models/bots/build.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" @@ -16,7 +17,6 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/bots/core" "github.com/google/uuid" "xorm.io/builder" diff --git a/models/bots/build_stage.go b/models/bots/build_stage.go index 0135959f80..1b8a2f389b 100644 --- a/models/bots/build_stage.go +++ b/models/bots/build_stage.go @@ -7,10 +7,10 @@ package bots import ( "context" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/routers/api/bots/core" "xorm.io/builder" ) diff --git a/models/bots/build_step.go b/models/bots/build_step.go index 15da724580..4e3e3b12bf 100644 --- a/models/bots/build_step.go +++ b/models/bots/build_step.go @@ -5,9 +5,9 @@ package bots import ( + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/routers/api/bots/core" ) type BuildStep struct { diff --git a/modules/notification/bots/bots.go b/modules/notification/bots/bots.go index 9fab742be8..7ceab1e70a 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/bots/bots.go @@ -9,6 +9,7 @@ import ( "encoding/json" "fmt" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" @@ -26,7 +27,6 @@ import ( "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/routers/api/bots/core" bots_service "code.gitea.io/gitea/services/bots" ) diff --git a/routers/api/bots/runner/runner.go b/routers/api/bots/runner/runner.go index 18a61c22bd..c1f8083519 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/bots/runner/runner.go @@ -8,9 +8,9 @@ import ( "context" "errors" + "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/routers/api/bots/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" diff --git a/routers/api/bots/scheduler/queue/queue.go b/routers/api/bots/scheduler/queue/queue.go index fd135d91bb..66730f55a7 100644 --- a/routers/api/bots/scheduler/queue/queue.go +++ b/routers/api/bots/scheduler/queue/queue.go @@ -9,8 +9,8 @@ import ( "sync" "time" + "code.gitea.io/gitea/core" "code.gitea.io/gitea/models/bots" - "code.gitea.io/gitea/routers/api/bots/core" runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) diff --git a/routers/api/bots/scheduler/queue/scheduler.go b/routers/api/bots/scheduler/queue/scheduler.go index 9c3100dca6..b0dc6b17bf 100644 --- a/routers/api/bots/scheduler/queue/scheduler.go +++ b/routers/api/bots/scheduler/queue/scheduler.go @@ -8,7 +8,7 @@ import ( "context" "time" - "code.gitea.io/gitea/routers/api/bots/core" + "code.gitea.io/gitea/core" ) type scheduler struct { diff --git a/routers/api/bots/socket.go b/routers/api/bots/socket.go index 1799fd0fa7..370b39fb1f 100644 --- a/routers/api/bots/socket.go +++ b/routers/api/bots/socket.go @@ -11,11 +11,11 @@ import ( "strings" "time" + "code.gitea.io/gitea/core" bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/routers/api/bots/core" "github.com/gorilla/websocket" )