...

go-gitea · techknowlogick · May 20, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025
commit d2af3ea701b3249601cf7fdf551df1845ff0b809
diff --git a/models/actions/task.go b/models/actions/task.go
@@ -337,6 +337,7 @@ func UpdateTask(ctx context.Context, task *ActionTask, cols ...string) error {
 	}
 	_, err := sess.Update(task)
 
+	// Automatically delete the ephemeral runner if the task is done
 	if err == nil && task.Status.IsDone() && util.SliceContainsString(cols, "status") {
 		return DeleteEphemeralRunner(ctx, task.RunnerID)
 	}

diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go
@@ -155,8 +155,8 @@ func CleanupEphemeralRunners(ctx context.Context) error {
 	return nil
 }
 
-// CleanupEphemeralRunnersByPickedTaskRepoID removes all ephemeral runners that have active/finished tasks on the given repository
-func CleanupEphemeralRunnersByPickedTaskRepoID(ctx context.Context, repoID int64) error {
+// CleanupEphemeralRunnersByPickedTaskOfRepo removes all ephemeral runners that have active/finished tasks on the given repository
+func CleanupEphemeralRunnersByPickedTaskOfRepo(ctx context.Context, repoID int64) error {
 	subQuery := builder.Select("`action_runner`.id").
 		From(builder.Select("*").From("`action_runner`"), "`action_runner`"). // mysql needs this redundant subquery
 		Join("INNER", "`action_task`", "`action_task`.`runner_id` = `action_runner`.`id`").

diff --git a/services/repository/delete.go b/services/repository/delete.go
@@ -134,11 +134,11 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
 		return err
 	}
 
-	// CleanupEphemeralRunnersByPickedTaskRepoID does delete ephemeral global/org/user that have started any task of this repo
+	// CleanupEphemeralRunnersByPickedTaskOfRepo deletes ephemeral global/org/user that have started any task of this repo
 	// The cannot pick a second task hardening for ephemeral runners expect that task objects remain available until runner deletion
 	// This method will delete affected ephemeral global/org/user runners
 	// &actions_model.ActionRunner{RepoID: repoID} does only handle ephemeral repository runners
-	if err := actions_service.CleanupEphemeralRunnersByPickedTaskRepoID(ctx, repoID); err != nil {
+	if err := actions_service.CleanupEphemeralRunnersByPickedTaskOfRepo(ctx, repoID); err != nil {
 		return fmt.Errorf("cleanupEphemeralRunners: %w", err)
 	}
 

diff --git a/tests/integration/actions_runner_ephemeral_deletion_test.go b/tests/integration/actions_runner_ephemeral_deletion_test.go
@@ -10,7 +10,6 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/util"
-	repo_service "code.gitea.io/gitea/services/repository"
 	user_service "code.gitea.io/gitea/services/user"
 	"code.gitea.io/gitea/tests"
 
@@ -19,7 +18,6 @@ import (
 
 func TestActionsRunnerEphemeralDeletion(t *testing.T) {
 	t.Run("ByTaskCompletion", testEphemeralActionsRunnerDeletionByTaskCompletion)
-	t.Run("ByRepository", testEphemeralActionsRunnerDeletionByRepository)
 	t.Run("ByUser", testEphemeralActionsRunnerDeletionByUser)
 }
 
@@ -41,25 +39,6 @@ func testEphemeralActionsRunnerDeletionByTaskCompletion(t *testing.T) {
 	assert.ErrorIs(t, err, util.ErrNotExist)
 }
 
-// Test that the ephemeral runner is deleted when a repository is deleted
-func testEphemeralActionsRunnerDeletionByRepository(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	_, err := actions_model.GetRunnerByID(t.Context(), 34350)
-	assert.NoError(t, err)
-
-	task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 52})
-	assert.Equal(t, actions_model.StatusRunning, task.Status)
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-
-	err = repo_service.DeleteRepositoryDirectly(t.Context(), user, task.RepoID, true)
-	assert.NoError(t, err)
-
-	_, err = actions_model.GetRunnerByID(t.Context(), 34350)
-	assert.ErrorIs(t, err, util.ErrNotExist)
-}
-
 // Test that the ephemeral runner is deleted when a user is deleted
 func testEphemeralActionsRunnerDeletionByUser(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()