diff --git a/models/bots/run.go b/models/actions/run.go similarity index 99% rename from models/bots/run.go rename to models/actions/run.go index cfeccc4f09..ccebf04f40 100644 --- a/models/bots/run.go +++ b/models/actions/run.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/run_job.go b/models/actions/run_job.go similarity index 99% rename from models/bots/run_job.go rename to models/actions/run_job.go index c927cd32ad..6855a0a11b 100644 --- a/models/bots/run_job.go +++ b/models/actions/run_job.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/run_job_list.go b/models/actions/run_job_list.go similarity index 99% rename from models/bots/run_job_list.go rename to models/actions/run_job_list.go index 4857a92f16..3a51d4832b 100644 --- a/models/bots/run_job_list.go +++ b/models/actions/run_job_list.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/run_list.go b/models/actions/run_list.go similarity index 99% rename from models/bots/run_list.go rename to models/actions/run_list.go index 52c2bd8d56..3314353b31 100644 --- a/models/bots/run_list.go +++ b/models/actions/run_list.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/runner.go b/models/actions/runner.go similarity index 99% rename from models/bots/runner.go rename to models/actions/runner.go index a1dd0807c0..d539926757 100644 --- a/models/bots/runner.go +++ b/models/actions/runner.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/runner_list.go b/models/actions/runner_list.go similarity index 99% rename from models/bots/runner_list.go rename to models/actions/runner_list.go index 2555ec693d..aee5dc5d85 100644 --- a/models/bots/runner_list.go +++ b/models/actions/runner_list.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/runner_token.go b/models/actions/runner_token.go similarity index 99% rename from models/bots/runner_token.go rename to models/actions/runner_token.go index 000e6a1c28..1e40e64507 100644 --- a/models/bots/runner_token.go +++ b/models/actions/runner_token.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/status.go b/models/actions/status.go similarity index 99% rename from models/bots/status.go rename to models/actions/status.go index 5b375a01fb..b278efaf86 100644 --- a/models/bots/status.go +++ b/models/actions/status.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import runnerv1 "code.gitea.io/bots-proto-go/runner/v1" diff --git a/models/bots/task.go b/models/actions/task.go similarity index 99% rename from models/bots/task.go rename to models/actions/task.go index 0c72100d0b..e0d8490b63 100644 --- a/models/bots/task.go +++ b/models/actions/task.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "bytes" diff --git a/models/bots/task_list.go b/models/actions/task_list.go similarity index 99% rename from models/bots/task_list.go rename to models/actions/task_list.go index 7b95035d42..8ba39d083c 100644 --- a/models/bots/task_list.go +++ b/models/actions/task_list.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/task_step.go b/models/actions/task_step.go similarity index 98% rename from models/bots/task_step.go rename to models/actions/task_step.go index 8d187568ec..5d330be01c 100644 --- a/models/bots/task_step.go +++ b/models/actions/task_step.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/models/bots/task_test.go b/models/actions/task_test.go similarity index 97% rename from models/bots/task_test.go rename to models/actions/task_test.go index 7f12c7ee75..6c3679e7d2 100644 --- a/models/bots/task_test.go +++ b/models/actions/task_test.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "math" diff --git a/models/bots/utils.go b/models/actions/utils.go similarity index 97% rename from models/bots/utils.go rename to models/actions/utils.go index c24834d592..0d0df292ca 100644 --- a/models/bots/utils.go +++ b/models/actions/utils.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "encoding/hex" diff --git a/modules/bots/bots.go b/modules/actions/bots.go similarity index 99% rename from modules/bots/bots.go rename to modules/actions/bots.go index 38985c0f89..8ae38a8f26 100644 --- a/modules/bots/bots.go +++ b/modules/actions/bots.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "bytes" diff --git a/modules/bots/log.go b/modules/actions/log.go similarity index 99% rename from modules/bots/log.go rename to modules/actions/log.go index 01df11ee5d..ddc517a7ba 100644 --- a/modules/bots/log.go +++ b/modules/actions/log.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "bufio" diff --git a/modules/bots/task_state.go b/modules/actions/task_state.go similarity index 97% rename from modules/bots/task_state.go rename to modules/actions/task_state.go index cb9db92d12..199525676f 100644 --- a/modules/bots/task_state.go +++ b/modules/actions/task_state.go @@ -1,10 +1,10 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" ) const ( diff --git a/modules/bots/task_state_test.go b/modules/actions/task_state_test.go similarity index 98% rename from modules/bots/task_state_test.go rename to modules/actions/task_state_test.go index bb45f6314e..66454e7add 100644 --- a/modules/bots/task_state_test.go +++ b/modules/actions/task_state_test.go @@ -1,12 +1,12 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "testing" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/modules/notification/bots/bots.go b/modules/notification/actions/bots.go similarity index 99% rename from modules/notification/bots/bots.go rename to modules/notification/actions/bots.go index 697571e698..0250a1c051 100644 --- a/modules/notification/bots/bots.go +++ b/modules/notification/actions/bots.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" diff --git a/modules/notification/bots/helper.go b/modules/notification/actions/helper.go similarity index 97% rename from modules/notification/bots/helper.go rename to modules/notification/actions/helper.go index 0b1712c9bd..f2b27edc9e 100644 --- a/modules/notification/bots/helper.go +++ b/modules/notification/actions/helper.go @@ -1,13 +1,13 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "fmt" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" packages_model "code.gitea.io/gitea/models/packages" @@ -16,13 +16,13 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" - bots_module "code.gitea.io/gitea/modules/bots" + bots_module "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" - bots_service "code.gitea.io/gitea/services/bots" + bots_service "code.gitea.io/gitea/services/actions" "github.com/nektos/act/pkg/jobparser" ) diff --git a/modules/notification/notification.go b/modules/notification/notification.go index fba5f54f10..109f08974e 100644 --- a/modules/notification/notification.go +++ b/modules/notification/notification.go @@ -12,8 +12,8 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification/action" + "code.gitea.io/gitea/modules/notification/actions" "code.gitea.io/gitea/modules/notification/base" - "code.gitea.io/gitea/modules/notification/bots" "code.gitea.io/gitea/modules/notification/indexer" "code.gitea.io/gitea/modules/notification/mail" "code.gitea.io/gitea/modules/notification/mirror" @@ -42,7 +42,7 @@ func NewContext() { RegisterNotifier(action.NewNotifier()) RegisterNotifier(mirror.NewNotifier()) if setting.Bots.Enabled { - RegisterNotifier(bots.NewNotifier()) + RegisterNotifier(actions.NewNotifier()) } } diff --git a/routers/api/bots/bots.go b/routers/api/actions/bots.go similarity index 88% rename from routers/api/bots/bots.go rename to routers/api/actions/bots.go index aa30ea5e69..e995870ceb 100644 --- a/routers/api/bots/bots.go +++ b/routers/api/actions/bots.go @@ -1,14 +1,14 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "net/http" "code.gitea.io/gitea/modules/web" - "code.gitea.io/gitea/routers/api/bots/grpc" + "code.gitea.io/gitea/routers/api/actions/grpc" ) func Routes(_ context.Context, prefix string) *web.Route { diff --git a/routers/api/bots/bots_test.go b/routers/api/actions/bots_test.go similarity index 77% rename from routers/api/bots/bots_test.go rename to routers/api/actions/bots_test.go index d53a951190..e3477b39d0 100644 --- a/routers/api/bots/bots_test.go +++ b/routers/api/actions/bots_test.go @@ -1,13 +1,13 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "testing" - "code.gitea.io/gitea/routers/api/bots/ping" + "code.gitea.io/gitea/routers/api/actions/ping" ) func TestPingService(t *testing.T) { diff --git a/routers/api/bots/grpc/grpc.go b/routers/api/actions/grpc/grpc.go similarity index 100% rename from routers/api/bots/grpc/grpc.go rename to routers/api/actions/grpc/grpc.go diff --git a/routers/api/bots/grpc/health.go b/routers/api/actions/grpc/health.go similarity index 100% rename from routers/api/bots/grpc/health.go rename to routers/api/actions/grpc/health.go diff --git a/routers/api/bots/grpc/ping.go b/routers/api/actions/grpc/ping.go similarity index 87% rename from routers/api/bots/grpc/ping.go rename to routers/api/actions/grpc/ping.go index 8bf40cdd6b..ecc4e8c3c2 100644 --- a/routers/api/bots/grpc/ping.go +++ b/routers/api/actions/grpc/ping.go @@ -6,7 +6,7 @@ package grpc import ( "net/http" - "code.gitea.io/gitea/routers/api/bots/ping" + "code.gitea.io/gitea/routers/api/actions/ping" "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" ) diff --git a/routers/api/bots/grpc/runner.go b/routers/api/actions/grpc/runner.go similarity index 88% rename from routers/api/bots/grpc/runner.go rename to routers/api/actions/grpc/runner.go index d0a046ff08..ae31516653 100644 --- a/routers/api/bots/grpc/runner.go +++ b/routers/api/actions/grpc/runner.go @@ -6,7 +6,7 @@ package grpc import ( "net/http" - "code.gitea.io/gitea/routers/api/bots/runner" + "code.gitea.io/gitea/routers/api/actions/runner" "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" ) diff --git a/routers/api/bots/ping/ping.go b/routers/api/actions/ping/ping.go similarity index 100% rename from routers/api/bots/ping/ping.go rename to routers/api/actions/ping/ping.go diff --git a/routers/api/bots/ping/ping_test.go b/routers/api/actions/ping/ping_test.go similarity index 100% rename from routers/api/bots/ping/ping_test.go rename to routers/api/actions/ping/ping_test.go diff --git a/routers/api/bots/ping/testping.go b/routers/api/actions/ping/testping.go similarity index 100% rename from routers/api/bots/ping/testping.go rename to routers/api/actions/ping/testping.go diff --git a/routers/api/bots/runner/runner.go b/routers/api/actions/runner/runner.go similarity index 98% rename from routers/api/bots/runner/runner.go rename to routers/api/actions/runner/runner.go index 2074399d70..d2fa7dcf17 100644 --- a/routers/api/bots/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/webhook" - "code.gitea.io/gitea/modules/bots" + "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - bot_service "code.gitea.io/gitea/services/bots" + bot_service "code.gitea.io/gitea/services/actions" secret_service "code.gitea.io/gitea/services/secrets" runnerv1 "code.gitea.io/bots-proto-go/runner/v1" @@ -197,7 +197,7 @@ func (s *Service) UpdateLog( } rows := req.Msg.Rows[ack-req.Msg.Index:] - ns, err := bots.WriteLogs(ctx, task.LogFilename, task.LogSize, rows) + ns, err := actions.WriteLogs(ctx, task.LogFilename, task.LogSize, rows) if err != nil { return nil, status.Errorf(codes.Internal, "write logs: %v", err) } @@ -215,7 +215,7 @@ func (s *Service) UpdateLog( var remove func() if req.Msg.NoMore { task.LogInStorage = true - remove, err = bots.TransferLogs(ctx, task.LogFilename) + remove, err = actions.TransferLogs(ctx, task.LogFilename) if err != nil { return nil, status.Errorf(codes.Internal, "transfer logs: %v", err) } diff --git a/routers/api/bots/runner/unary.go b/routers/api/actions/runner/unary.go similarity index 97% rename from routers/api/bots/runner/unary.go rename to routers/api/actions/runner/unary.go index d1c683d5da..dfa3550ba6 100644 --- a/routers/api/bots/runner/unary.go +++ b/routers/api/actions/runner/unary.go @@ -8,8 +8,8 @@ import ( "crypto/subtle" "strings" + bots_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" - bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 6f1f242d8f..a9fd0b8444 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -70,7 +70,7 @@ import ( "reflect" "strings" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" diff --git a/routers/common/runners.go b/routers/common/runners.go index eb9c78d634..c4e4bf9835 100644 --- a/routers/common/runners.go +++ b/routers/common/runners.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" diff --git a/routers/init.go b/routers/init.go index 297cc88c8b..cd42645362 100644 --- a/routers/init.go +++ b/routers/init.go @@ -30,16 +30,16 @@ import ( "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" - bots_router "code.gitea.io/gitea/routers/api/bots" + bots_router "code.gitea.io/gitea/routers/api/actions" packages_router "code.gitea.io/gitea/routers/api/packages" apiv1 "code.gitea.io/gitea/routers/api/v1" "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/routers/private" web_routers "code.gitea.io/gitea/routers/web" + bot_service "code.gitea.io/gitea/services/actions" "code.gitea.io/gitea/services/auth" "code.gitea.io/gitea/services/auth/source/oauth2" "code.gitea.io/gitea/services/automerge" - bot_service "code.gitea.io/gitea/services/bots" "code.gitea.io/gitea/services/cron" "code.gitea.io/gitea/services/mailer" markup_service "code.gitea.io/gitea/services/markup" diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 90319927ab..ea29eab898 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -7,7 +7,7 @@ package admin import ( "net/url" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" diff --git a/routers/web/org/org_runners.go b/routers/web/org/org_runners.go index 56eca6a138..c2c37b812a 100644 --- a/routers/web/org/org_runners.go +++ b/routers/web/org/org_runners.go @@ -6,7 +6,7 @@ package org import ( "net/url" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/common" diff --git a/routers/web/repo/bots/bots.go b/routers/web/repo/actions/bots.go similarity index 95% rename from routers/web/repo/bots/bots.go rename to routers/web/repo/actions/bots.go index 0634d9721f..44808559e4 100644 --- a/routers/web/repo/bots/bots.go +++ b/routers/web/repo/actions/bots.go @@ -1,16 +1,16 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "net/http" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/bots" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/setting" @@ -57,7 +57,7 @@ func List(ctx *context.Context) { return } - workflows, err := bots.ListWorkflows(commit) + workflows, err := actions.ListWorkflows(commit) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return diff --git a/routers/web/repo/bots/view.go b/routers/web/repo/actions/view.go similarity index 96% rename from routers/web/repo/bots/view.go rename to routers/web/repo/actions/view.go index b3780a2709..388a8b8019 100644 --- a/routers/web/repo/bots/view.go +++ b/routers/web/repo/actions/view.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" @@ -9,13 +9,13 @@ import ( "net/http" "time" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/bots" + "code.gitea.io/gitea/modules/actions" context_module "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/web" - bots_service "code.gitea.io/gitea/services/bots" + bots_service "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "xorm.io/builder" @@ -145,7 +145,7 @@ func ViewPost(ctx *context_module.Context) { resp.LogsData.StreamingLogs = make([]ViewStepLog, 0, len(req.StepLogCursors)) resp.StateData.CurrentJobInfo.Detail = current.Status.String() if task != nil { - steps := bots.FullSteps(task) + steps := actions.FullSteps(task) resp.StateData.CurrentJobSteps = make([]ViewJobStep, len(steps)) for i, v := range steps { @@ -165,7 +165,7 @@ func ViewPost(ctx *context_module.Context) { length := step.LogLength - cursor.Cursor offset := (*task.LogIndexes)[index] var err error - logRows, err = bots.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length) + logRows, err = actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go index 4f3664fc24..0c3400a6ec 100644 --- a/routers/web/repo/http.go +++ b/routers/web/repo/http.go @@ -18,8 +18,8 @@ import ( "sync" "time" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/auth" - bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" repo_model "code.gitea.io/gitea/models/repo" diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index d009e72a69..58ba651cc3 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -6,7 +6,7 @@ package repo import ( "net/url" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/routers/common" diff --git a/routers/web/web.go b/routers/web/web.go index 273f3dd798..8f24868b8b 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -34,7 +34,7 @@ import ( "code.gitea.io/gitea/routers/web/misc" "code.gitea.io/gitea/routers/web/org" "code.gitea.io/gitea/routers/web/repo" - "code.gitea.io/gitea/routers/web/repo/bots" + "code.gitea.io/gitea/routers/web/repo/actions" "code.gitea.io/gitea/routers/web/user" user_setting "code.gitea.io/gitea/routers/web/user/setting" "code.gitea.io/gitea/routers/web/user/setting/security" @@ -629,7 +629,7 @@ func RegisterRoutes(m *web.Route) { m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.EditRunnerForm{}), admin.EditRunnerPost) m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) - }, bots.MustEnableBots) + }, actions.MustEnableBots) }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable ctx.Data["EnablePackages"] = setting.Packages.Enabled @@ -792,7 +792,7 @@ func RegisterRoutes(m *web.Route) { Post(bindIgnErr(forms.EditRunnerForm{}), org.RunnersEditPost) m.Post("/{runnerid}/delete", org.RunnerDeletePost) m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) - }, bots.MustEnableBots) + }, actions.MustEnableBots) m.Group("/secrets", func() { m.Get("", org.Secrets) @@ -960,7 +960,7 @@ func RegisterRoutes(m *web.Route) { Post(bindIgnErr(forms.EditRunnerForm{}), repo.RunnersEditPost) m.Post("/{runnerid}/delete", repo.RunnerDeletePost) m.Get("/reset_registration_token", repo.ResetRunnerRegistrationToken) - }, bots.MustEnableBots) + }, actions.MustEnableBots) }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true ctx.Data["LFSStartServer"] = setting.LFS.StartServer @@ -1200,21 +1200,21 @@ func RegisterRoutes(m *web.Route) { }, reqRepoProjectsReader, repo.MustEnableProjects) m.Group("/bots", func() { - m.Get("", bots.List) + m.Get("", actions.List) m.Group("/runs/{run}", func() { m.Combo(""). - Get(bots.View). - Post(bindIgnErr(bots.ViewRequest{}), bots.ViewPost) + Get(actions.View). + Post(bindIgnErr(actions.ViewRequest{}), actions.ViewPost) m.Group("/jobs/{job}", func() { m.Combo(""). - Get(bots.View). - Post(bindIgnErr(bots.ViewRequest{}), bots.ViewPost) - m.Post("/rerun", bots.Rerun) + Get(actions.View). + Post(bindIgnErr(actions.ViewRequest{}), actions.ViewPost) + m.Post("/rerun", actions.Rerun) }) - m.Post("/cancel", bots.Cancel) + m.Post("/cancel", actions.Cancel) }) - }, reqRepoBotsReader, bots.MustEnableBots) + }, reqRepoBotsReader, actions.MustEnableBots) m.Group("/wiki", func() { m.Combo("/"). diff --git a/services/bots/bots.go b/services/actions/bots.go similarity index 97% rename from services/bots/bots.go rename to services/actions/bots.go index c3f5317319..446df879e7 100644 --- a/services/bots/bots.go +++ b/services/actions/bots.go @@ -1,19 +1,19 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "fmt" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" - bots_module "code.gitea.io/gitea/modules/bots" + bots_module "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/queue" diff --git a/services/bots/clear_tasks.go b/services/actions/clear_tasks.go similarity index 97% rename from services/bots/clear_tasks.go rename to services/actions/clear_tasks.go index e705023ce9..7bfd42a70c 100644 --- a/services/bots/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -1,13 +1,13 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "time" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" diff --git a/services/bots/job_emitter.go b/services/actions/job_emitter.go similarity index 98% rename from services/bots/job_emitter.go rename to services/actions/job_emitter.go index ee06860836..2974232d31 100644 --- a/services/bots/job_emitter.go +++ b/services/actions/job_emitter.go @@ -1,14 +1,14 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "context" "errors" "fmt" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/queue" diff --git a/services/bots/job_emitter_test.go b/services/actions/job_emitter_test.go similarity index 97% rename from services/bots/job_emitter_test.go rename to services/actions/job_emitter_test.go index 42f8645fdf..03928114cf 100644 --- a/services/bots/job_emitter_test.go +++ b/services/actions/job_emitter_test.go @@ -1,12 +1,12 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package bots +package actions import ( "testing" - bots_model "code.gitea.io/gitea/models/bots" + bots_model "code.gitea.io/gitea/models/actions" "github.com/stretchr/testify/assert" ) diff --git a/services/auth/basic.go b/services/auth/basic.go index 4bfd827bc3..ca6ba17c63 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" + bots_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" - bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index f4c6c52666..51c49aa159 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -9,8 +9,8 @@ import ( "strings" "time" + bots_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" - bots_model "code.gitea.io/gitea/models/bots" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" diff --git a/services/cron/tasks_bots.go b/services/cron/tasks_bots.go index 3dcfe224e4..d4acfa7061 100644 --- a/services/cron/tasks_bots.go +++ b/services/cron/tasks_bots.go @@ -7,7 +7,7 @@ import ( "context" user_model "code.gitea.io/gitea/models/user" - bots_service "code.gitea.io/gitea/services/bots" + bots_service "code.gitea.io/gitea/services/actions" ) func initBotsTasks() { diff --git a/services/repository/repository.go b/services/repository/repository.go index 10a4b5b67d..724f3463ae 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -20,7 +20,7 @@ import ( "code.gitea.io/gitea/modules/notification" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" - bots_service "code.gitea.io/gitea/services/bots" + bots_service "code.gitea.io/gitea/services/actions" pull_service "code.gitea.io/gitea/services/pull" ) diff --git a/templates/repo/bots/build_list.tmpl b/templates/repo/actions/build_list.tmpl similarity index 100% rename from templates/repo/bots/build_list.tmpl rename to templates/repo/actions/build_list.tmpl diff --git a/templates/repo/bots/list.tmpl b/templates/repo/actions/list.tmpl similarity index 100% rename from templates/repo/bots/list.tmpl rename to templates/repo/actions/list.tmpl diff --git a/templates/repo/bots/openclose.tmpl b/templates/repo/actions/openclose.tmpl similarity index 100% rename from templates/repo/bots/openclose.tmpl rename to templates/repo/actions/openclose.tmpl diff --git a/templates/repo/bots/status.tmpl b/templates/repo/actions/status.tmpl similarity index 100% rename from templates/repo/bots/status.tmpl rename to templates/repo/actions/status.tmpl diff --git a/templates/repo/bots/view.tmpl b/templates/repo/actions/view.tmpl similarity index 100% rename from templates/repo/bots/view.tmpl rename to templates/repo/actions/view.tmpl