ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename import alias

Browse Source
This commit is contained in:
Jason Song
2022-12-05 15:57:45 +08:00
parent 5f74b35377
commit 67c5c8868b
22 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/actions/actions.go
View File

@@ -7,13 +7,13 @@ import (
"context"
"fmt"
bots_model "code.gitea.io/gitea/models/actions"
actions_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/actions"
actions_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"
@@ -26,26 +26,26 @@ func Init() {
}
func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository) error {
tasks, _, err := bots_model.FindTasks(ctx, bots_model.FindTaskOptions{RepoID: repo.ID})
tasks, _, err := actions_model.FindTasks(ctx, actions_model.FindTaskOptions{RepoID: repo.ID})
if err != nil {
return fmt.Errorf("find task of repo %v: %w", repo.ID, err)
}
if err := db.WithTx(ctx, func(ctx context.Context) error {
e := db.GetEngine(ctx)
if _, err := e.Delete(&bots_model.BotTaskStep{RepoID: repo.ID}); err != nil {
if _, err := e.Delete(&actions_model.BotTaskStep{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots task steps of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&bots_model.BotTask{RepoID: repo.ID}); err != nil {
if _, err := e.Delete(&actions_model.BotTask{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots tasks of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&bots_model.BotRunJob{RepoID: repo.ID}); err != nil {
if _, err := e.Delete(&actions_model.BotRunJob{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots run jobs of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&bots_model.BotRun{RepoID: repo.ID}); err != nil {
if _, err := e.Delete(&actions_model.BotRun{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots runs of repo %d: %w", repo.ID, err)
}
if _, err := e.Delete(&bots_model.BotRunner{RepoID: repo.ID}); err != nil {
if _, err := e.Delete(&actions_model.BotRunner{RepoID: repo.ID}); err != nil {
return fmt.Errorf("delete bots runner of repo %d: %w", repo.ID, err)
}
return nil
@@ -55,7 +55,7 @@ func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository
// remove logs file after tasks have been deleted, to avoid new log files
for _, task := range tasks {
err := bots_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename)
err := actions_module.RemoveLogs(ctx, task.LogInStorage, task.LogFilename)
if err != nil {
log.Error("remove log file %q: %v", task.LogFilename, err)
// go on
@@ -65,7 +65,7 @@ func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository
return nil
}
func CreateCommitStatus(ctx context.Context, job *bots_model.BotRunJob) error {
func CreateCommitStatus(ctx context.Context, job *actions_model.BotRunJob) error {
if err := job.LoadAttributes(ctx); err != nil {
return fmt.Errorf("load run: %w", err)
}
@@ -122,15 +122,15 @@ func CreateCommitStatus(ctx context.Context, job *bots_model.BotRunJob) error {
return nil
}
func toCommitStatus(status bots_model.Status) api.CommitStatusState {
func toCommitStatus(status actions_model.Status) api.CommitStatusState {
switch status {
case bots_model.StatusSuccess:
case actions_model.StatusSuccess:
return api.CommitStatusSuccess
case bots_model.StatusFailure, bots_model.StatusCancelled, bots_model.StatusSkipped:
case actions_model.StatusFailure, actions_model.StatusCancelled, actions_model.StatusSkipped:
return api.CommitStatusFailure
case bots_model.StatusWaiting, bots_model.StatusBlocked:
case actions_model.StatusWaiting, actions_model.StatusBlocked:
return api.CommitStatusPending
case bots_model.StatusRunning:
case actions_model.StatusRunning:
return api.CommitStatusRunning
default:
return api.CommitStatusError