FIX

Author: NorthRealm

models/actions/run.go

@@ -4,10 +4,6 @@
 package actions
 
 import (
-	actions_module "code.gitea.io/gitea/modules/actions"
-	container_module "code.gitea.io/gitea/modules/container"
-	log_module "code.gitea.io/gitea/modules/log"
-	storage_module "code.gitea.io/gitea/modules/storage"
 	"context"
 	"errors"
 	"fmt"
@@ -443,74 +439,4 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 	return nil
 }
 
-// TODO: When deleting a run, it should at lease delete artifacts, tasks logs, database record.
-func DeleteRun(ctx context.Context, repoID int64, run *ActionRun, jobs []*ActionRunJob) error {
-	tasks := make(TaskList, 0)
-
-	jobIDs := container_module.FilterSlice(jobs, func(j *ActionRunJob) (int64, bool) {
-		return j.ID, j.ID != 0
-	})
-
-	if len(jobIDs) > 0 {
-		if err := db.GetEngine(ctx).Where("repo_id = ?", repoID).In("job_id", jobIDs).Find(&tasks); err != nil {
-			return err
-		}
-	}
-
-	artifacts, err := db.Find[ActionArtifact](ctx, FindArtifactsOptions{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-	if err != nil {
-		return err
-	}
-
-	var recordsToDelete []any
-
-	for _, task := range tasks {
-		recordsToDelete = append(recordsToDelete, &ActionTask{
-			RepoID: repoID,
-			ID:     task.ID,
-		})
-		recordsToDelete = append(recordsToDelete, &ActionTaskStep{
-			RepoID: repoID,
-			TaskID: task.ID,
-		})
-	}
-	recordsToDelete = append(recordsToDelete, &ActionRunJob{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-	recordsToDelete = append(recordsToDelete, &ActionRun{
-		RepoID: repoID,
-		ID:     run.ID,
-	})
-	recordsToDelete = append(recordsToDelete, &ActionArtifact{
-		RepoID: repoID,
-		RunID:  run.ID,
-	})
-
-	if err := db.WithTx(ctx, func(ctx context.Context) error {
-		return db.DeleteBeans(ctx, recordsToDelete...)
-	}); err != nil {
-		return err
-	}
-
-	// Delete files on storage
-	for _, tas := range tasks {
-		err := actions_module.RemoveLogs(ctx, tas.LogInStorage, tas.LogFilename)
-		if err != nil {
-			log_module.Error("remove log file %q: %v", tas.LogFilename, err)
-		}
-	}
-	for _, art := range artifacts {
-		if err := storage_module.ActionsArtifacts.Delete(art.StoragePath); err != nil {
-			log_module.Error("remove artifact file %q: %v", art.StoragePath, err)
-		}
-	}
-
-	// TODO: Delete commit status? Looks like it has no direct reference to a run/task/job. Not quite feasible without modifying db models (Dangerous).
-	return nil
-}
-
 type ActionRunIndex db.ResourceIndex

modules/actions/run.go

@@ -0,0 +1,80 @@
+package actions
+
+import (
+	"code.gitea.io/gitea/models/actions"
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/modules/container"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/storage"
+	"context"
+)
+
+// TODO: When deleting a run, it should at lease delete artifacts, tasks logs, database record.
+func DeleteRun(ctx context.Context, repoID int64, run *actions.ActionRun, jobs []*actions.ActionRunJob) error {
+	tasks := make(actions.TaskList, 0)
+
+	jobIDs := container.FilterSlice(jobs, func(j *actions.ActionRunJob) (int64, bool) {
+		return j.ID, j.ID != 0
+	})
+
+	if len(jobIDs) > 0 {
+		if err := db.GetEngine(ctx).Where("repo_id = ?", repoID).In("job_id", jobIDs).Find(&tasks); err != nil {
+			return err
+		}
+	}
+
+	artifacts, err := db.Find[actions.ActionArtifact](ctx, actions.FindArtifactsOptions{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+	if err != nil {
+		return err
+	}
+
+	var recordsToDelete []any
+
+	for _, task := range tasks {
+		recordsToDelete = append(recordsToDelete, &actions.ActionTask{
+			RepoID: repoID,
+			ID:     task.ID,
+		})
+		recordsToDelete = append(recordsToDelete, &actions.ActionTaskStep{
+			RepoID: repoID,
+			TaskID: task.ID,
+		})
+	}
+	recordsToDelete = append(recordsToDelete, &actions.ActionRunJob{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+	recordsToDelete = append(recordsToDelete, &actions.ActionRun{
+		RepoID: repoID,
+		ID:     run.ID,
+	})
+	recordsToDelete = append(recordsToDelete, &actions.ActionArtifact{
+		RepoID: repoID,
+		RunID:  run.ID,
+	})
+
+	if err := db.WithTx(ctx, func(ctx context.Context) error {
+		return db.DeleteBeans(ctx, recordsToDelete...)
+	}); err != nil {
+		return err
+	}
+
+	// Delete files on storage
+	for _, tas := range tasks {
+		err := RemoveLogs(ctx, tas.LogInStorage, tas.LogFilename)
+		if err != nil {
+			log.Error("remove log file %q: %v", tas.LogFilename, err)
+		}
+	}
+	for _, art := range artifacts {
+		if err := storage.ActionsArtifacts.Delete(art.StoragePath); err != nil {
+			log.Error("remove artifact file %q: %v", art.StoragePath, err)
+		}
+	}
+
+	// TODO: Delete commit status? Looks like it has no direct reference to a run/task/job. Not quite feasible without modifying db models (Dangerous).
+	return nil
+}

routers/api/v1/repo/action.go

@@ -1121,7 +1121,7 @@ func DeleteActionRun(ctx *context.APIContext) {
 		return
 	}
 
-	if err := actions_model.DeleteRun(ctx, repoID, run, jobs); err != nil {
+	if err := actions.DeleteRun(ctx, repoID, run, jobs); err != nil {
 		ctx.APIErrorInternal(err)
 		return
 	}

routers/web/repo/actions/view.go

@@ -598,7 +598,7 @@ func Delete(ctx *context_module.Context) {
 
 	repoID := ctx.Repo.Repository.ID
 
-	if err := actions_model.DeleteRun(ctx, repoID, run, jobs); err != nil {
+	if err := actions.DeleteRun(ctx, repoID, run, jobs); err != nil {
 		ctx.HTTPError(http.StatusInternalServerError, err.Error())
 		return
 	}