From fcd6948539b6e3a047d1fcf8a30ca0a2be692792 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Tue, 7 Jan 2025 23:01:23 +0700 Subject: [PATCH 01/28] feat(runs_list): add button delete workflow run --- templates/repo/actions/runs_list.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index fa1adb3e3b..0ccda8b094 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -35,9 +35,32 @@
{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}
{{svg "octicon-stopwatch" 16}}{{.Duration}}
+ {{ if and (ne .Status 6) (ne .Status 5) }} +
+ +
+ {{ end }}
{{end}} + + {{template "base/paginate" .}} From 862237cd05488e22147cacd4a3dda8ad89c73b9b Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Tue, 7 Jan 2025 23:33:48 +0700 Subject: [PATCH 02/28] fix: lint --- templates/repo/actions/runs_list.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 0ccda8b094..29417c2c68 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -35,18 +35,19 @@
{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}
{{svg "octicon-stopwatch" 16}}{{.Duration}}
- {{ if and (ne .Status 6) (ne .Status 5) }} + {{if and (ne .Status 6) (ne .Status 5)}}
- {{ end }} + {{end}}
From 5358fc50547679f1cd36de23771cc06f317bcbb0 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 01:14:49 +0700 Subject: [PATCH 03/28] feat(action_model): add query DeleteRunByID --- models/actions/run.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/models/actions/run.go b/models/actions/run.go index a224a910ab..e19cb7ee95 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -435,3 +435,10 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { } type ActionRunIndex db.ResourceIndex + +// DeleteRunByID delete action_run. +func DeleteRunByID(ctx context.Context, id int64) error { + var run ActionRun + _, err := db.GetEngine(ctx).Where("id=?", id).Delete(&run) + return err +} From c8dbc29c9a3574f59b8d7b87bc97ab183d7573b5 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 01:16:00 +0700 Subject: [PATCH 04/28] feat(web): add path DELETE /username/reponame/actions/runs/{id} --- routers/web/repo/actions/actions.go | 29 +++++++++++++++++++++++++++++ routers/web/web.go | 2 ++ 2 files changed, 31 insertions(+) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 539c4b6ed0..97c3075165 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -6,8 +6,10 @@ package actions import ( "bytes" stdCtx "context" + "fmt" "net/http" "slices" + "strconv" "strings" actions_model "code.gitea.io/gitea/models/actions" @@ -424,3 +426,30 @@ func decodeNode(node yaml.Node, out any) bool { } return true } + +func DeleteRun(ctx *context.Context) { + actionRunIDStr := ctx.PathParam("id") + if len(actionRunIDStr) < 1 { + ctx.ServerError("missing action_run.id for delete action run", nil) + return + } + actionRunID, err := strconv.ParseInt(actionRunIDStr, 10, 64) + if err != nil { + ctx.ServerError("failed to casting action_run.id string to int64", err) + return + } + + actionRun, err := actions_model.GetRunByID(ctx, actionRunID) + if err != nil { + ctx.ServerError("failed to get action_run", err) + return + } + err = actions_model.DeleteRunByID(ctx, actionRun.ID) + if err != nil { + ctx.ServerError("failed to delete action_run", err) + return + } + ctx.JSON(http.StatusOK, map[string]any{ + "redirect": fmt.Sprintf("%s/actions", ctx.Repo.RepoLink), + }) +} diff --git a/routers/web/web.go b/routers/web/web.go index 32d65865ac..8335d14e7f 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1434,6 +1434,8 @@ func registerRoutes(m *web.Router) { m.Group("/workflows/{workflow_name}", func() { m.Get("/badge.svg", actions.GetWorkflowBadge) }) + + m.Delete("/runs/{id}", reqRepoActionsReader, actions.DeleteRun) }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions) // end "/{username}/{reponame}/actions" From 3938aeadd55f009c5b04cf7c4c32903751ee7bd1 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 01:16:45 +0700 Subject: [PATCH 05/28] feat(initGlobalDeleteButton): add option http method delete when data-method is delete --- web_src/js/features/common-button.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts index acce992b90..2de2eb8616 100644 --- a/web_src/js/features/common-button.ts +++ b/web_src/js/features/common-button.ts @@ -1,4 +1,4 @@ -import {POST} from '../modules/fetch.ts'; +import {DELETE, POST} from '../modules/fetch.ts'; import {addDelegatedEventListener, hideElem, queryElems, showElem, toggleElem} from '../utils/dom.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; import {camelize} from 'vue'; @@ -62,7 +62,10 @@ export function initGlobalDeleteButton(): void { } } - const response = await POST(btn.getAttribute('data-url'), {data: postData}); + const method = btn.getAttribute('data-method')?.toUpperCase() || 'POST'; + const response = method === 'DELETE' + ? await DELETE(btn.getAttribute('data-url')) + : await POST(btn.getAttribute('data-url'), {data: postData}); if (response.ok) { const data = await response.json(); window.location.href = data.redirect; From 6c58a023626cfcf7004ff9277927fdc9c20b68e2 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 01:41:45 +0700 Subject: [PATCH 06/28] fix: lint --- templates/repo/actions/runs_list.tmpl | 30 ++++++++++----------------- web_src/js/features/common-button.ts | 6 +++--- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 29417c2c68..26010403df 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -37,17 +37,9 @@
{{svg "octicon-stopwatch" 16}}{{.Duration}}
{{if and (ne .Status 6) (ne .Status 5)}}
- -
- {{end}} + + + {{end}} @@ -55,13 +47,13 @@ {{template "base/paginate" .}} diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts index 2de2eb8616..3df071d617 100644 --- a/web_src/js/features/common-button.ts +++ b/web_src/js/features/common-button.ts @@ -63,9 +63,9 @@ export function initGlobalDeleteButton(): void { } const method = btn.getAttribute('data-method')?.toUpperCase() || 'POST'; - const response = method === 'DELETE' - ? await DELETE(btn.getAttribute('data-url')) - : await POST(btn.getAttribute('data-url'), {data: postData}); + const response = method === 'DELETE' ? + await DELETE(btn.getAttribute('data-url')) : + await POST(btn.getAttribute('data-url'), {data: postData}); if (response.ok) { const data = await response.json(); window.location.href = data.redirect; From 8170c47b07fcc2cf15917c32567892780f8f831f Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 02:15:50 +0700 Subject: [PATCH 07/28] feat(DeleteRunByID): add delete action_run_job --- models/actions/run.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index e19cb7ee95..54faa029d8 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -436,9 +436,22 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { type ActionRunIndex db.ResourceIndex -// DeleteRunByID delete action_run. +// DeleteRunByID delete action_run and action_run_job. func DeleteRunByID(ctx context.Context, id int64) error { - var run ActionRun - _, err := db.GetEngine(ctx).Where("id=?", id).Delete(&run) - return err + ctx, committer, err := db.TxContext(ctx) + if err != nil { + return err + } + defer committer.Close() + _, err = db.GetEngine(ctx).Where("id=?", id).Delete(ActionRun{}) + if err != nil { + return err + } + + _, err = db.GetEngine(ctx).Where("run_id=?", id).Delete(ActionRunJob{}) + if err != nil { + return err + } + + return committer.Commit() } From c4bdf78bda53e23c0125df0191c5692a2ed3ec84 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 10:19:19 +0700 Subject: [PATCH 08/28] refactor: change middleware to reqRepoActionsWriter --- routers/web/web.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/web.go b/routers/web/web.go index 8335d14e7f..2bc49efc55 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1435,7 +1435,7 @@ func registerRoutes(m *web.Router) { m.Get("/badge.svg", actions.GetWorkflowBadge) }) - m.Delete("/runs/{id}", reqRepoActionsReader, actions.DeleteRun) + m.Delete("/runs/{id}", reqRepoActionsWriter, actions.DeleteRun) }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions) // end "/{username}/{reponame}/actions" From 1e752123e93392866604320c68895546cfd9bca2 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 15:25:09 +0700 Subject: [PATCH 09/28] feat(websrc): add repo action for handling delete --- web_src/js/features/repo-action-list.ts | 97 +++++++++++++++++++++++++ web_src/js/index.ts | 2 + 2 files changed, 99 insertions(+) create mode 100644 web_src/js/features/repo-action-list.ts diff --git a/web_src/js/features/repo-action-list.ts b/web_src/js/features/repo-action-list.ts new file mode 100644 index 0000000000..cd9a8b1ccb --- /dev/null +++ b/web_src/js/features/repo-action-list.ts @@ -0,0 +1,97 @@ +import {queryElems, toggleElem} from '../utils/dom.ts'; +import {confirmModal} from './comp/ConfirmModal.ts'; +import {showErrorToast} from '../modules/toast.ts'; +import {POST} from '../modules/fetch.ts'; + +function initRepoActionListCheckboxes() { + const actionListSelectAll = document.querySelector('.action-checkbox-all'); + if (!actionListSelectAll) return; // logged out state + const issueCheckboxes = document.querySelectorAll('.action-checkbox:not([disabled])'); + const actionDelete = document.querySelector('#action-delete'); + const syncIssueSelectionState = () => { + const enabledCheckboxes = Array.from(issueCheckboxes).filter((el) => !el.disabled); + const checkedCheckboxes = enabledCheckboxes.filter((el) => el.checked); + const anyChecked = Boolean(checkedCheckboxes.length); + const allChecked = anyChecked && checkedCheckboxes.length === enabledCheckboxes.length; + + if (allChecked) { + actionListSelectAll.checked = true; + actionListSelectAll.indeterminate = false; + } else if (anyChecked) { + actionListSelectAll.checked = false; + actionListSelectAll.indeterminate = true; + } else { + actionListSelectAll.checked = false; + actionListSelectAll.indeterminate = false; + } + if (actionDelete) { + toggleElem('#action-delete', anyChecked); + } + }; + + for (const el of issueCheckboxes) { + el.addEventListener('change', syncIssueSelectionState); + } + + actionListSelectAll.addEventListener('change', () => { + for (const el of issueCheckboxes) { + if (!el.disabled) { + el.checked = actionListSelectAll.checked; + } + } + syncIssueSelectionState(); + }); + + queryElems(document, '.action-action', (el) => el.addEventListener('click', + async (e: MouseEvent) => { + e.preventDefault(); + + const action = el.getAttribute('data-action'); + const url = el.getAttribute('data-url'); + const actionIDList: number[] = []; + const radix = 10; + for (const el of document.querySelectorAll('.action-checkbox:checked:not([disabled])')) { + const id = el.getAttribute('data-action-id'); + if (id) { + actionIDList.push(parseInt(id, radix)); + } + } + if (actionIDList.length < 1) return; + + // for delete + if (action === 'delete') { + const confirmText = el.getAttribute('data-action-delete-confirm'); + if (!await confirmModal({content: confirmText, confirmButtonColor: 'red'})) { + return; + } + } + + try { + await deleteActions(url, actionIDList); + window.location.reload(); + } catch (err) { + showErrorToast(err.responseJSON?.error ?? err.message); + } + }, + )); +} + +async function deleteActions(url: string, actionIds: number[]) { + try { + const response = await POST(url, { + data: { + actionIds, + }, + }); + if (!response.ok) { + throw new Error('failed to delete actions'); + } + } catch (error) { + console.error(error); + } +} +export function initRepoActionList() { + if (document.querySelector('.page-content.repository.actions')) { + initRepoActionListCheckboxes(); + } +} diff --git a/web_src/js/index.ts b/web_src/js/index.ts index 022be033da..6ed0c375dc 100644 --- a/web_src/js/index.ts +++ b/web_src/js/index.ts @@ -86,6 +86,7 @@ import { initGlobalEnterQuickSubmit, initGlobalFormDirtyLeaveConfirm, } from './features/common-form.ts'; +import {initRepoActionList} from './features/repo-action-list.ts'; initGiteaFomantic(); initDirAuto(); @@ -214,5 +215,6 @@ onDomReady(() => { initColorPickers, initOAuth2SettingsDisableCheckbox, + initRepoActionList, ]); }); From aa8a3d0789c74285185f026e11cbb420aea9f1b5 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 15:35:15 +0700 Subject: [PATCH 10/28] feat(action.list): add checkbox all and button delete --- templates/repo/actions/list.tmpl | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 7d782c0ade..c781d4ee01 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -25,7 +25,19 @@
-
+ {{if .AllowDisableOrEnableWorkflow}} From b6afdc6cc78b07e061d1acb97db6d1c2378e0317 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 15:35:44 +0700 Subject: [PATCH 11/28] refactor(run_list): change from button delete workflow to checkbox --- templates/repo/actions/runs_list.tmpl | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 26010403df..3ff8f78769 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,4 +1,4 @@ -
+
{{if not .Runs}}
{{svg "octicon-no-entry" 48}} @@ -7,6 +7,7 @@ {{end}} {{range .Runs}}
+
{{template "repo/actions/status" (dict "status" .Status.String)}}
@@ -35,25 +36,9 @@
{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}
{{svg "octicon-stopwatch" 16}}{{.Duration}}
- {{if and (ne .Status 6) (ne .Status 5)}} -
- -
- {{end}}
{{end}}
- - {{template "base/paginate" .}} From 8413beba4b050b77c7a388d6b07f6a517699dbe7 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 15:36:19 +0700 Subject: [PATCH 12/28] refactor(action.delete): change to support plural delete action runs --- models/actions/run.go | 21 +++++++++++++--- routers/web/repo/actions/actions.go | 39 ++++++++++++++++++----------- routers/web/web.go | 2 +- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 6dbc5fa431..ecf02eada0 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -436,22 +436,35 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { type ActionRunIndex db.ResourceIndex -// DeleteRunByID delete action_run and action_run_job. -func DeleteRunByID(ctx context.Context, id int64) error { +// DeleteRunByIDs delete action_run and action_run_job. +func DeleteRunByIDs(ctx context.Context, ids []int64) error { ctx, committer, err := db.TxContext(ctx) if err != nil { return err } defer committer.Close() - _, err = db.GetEngine(ctx).Where("id=?", id).Delete(ActionRun{}) + _, err = db.GetEngine(ctx).In("id", ids).Delete(ActionRun{}) if err != nil { return err } - _, err = db.GetEngine(ctx).Where("run_id=?", id).Delete(ActionRunJob{}) + _, err = db.GetEngine(ctx).In("run_id", ids).Delete(ActionRunJob{}) if err != nil { return err } return committer.Commit() } + +func GetRunsByIDs(ctx context.Context, ids []int64) ([]*ActionRun, error) { + var runs []*ActionRun + err := db.GetEngine(ctx).In("id", ids).Find(&runs) + if err != nil { + return nil, err + } + if len(runs) < 1 { + return nil, fmt.Errorf("run with ids %d: %w", ids, util.ErrNotExist) + } + + return runs, nil +} diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 97c3075165..9a6a142a16 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -6,10 +6,8 @@ package actions import ( "bytes" stdCtx "context" - "fmt" "net/http" "slices" - "strconv" "strings" actions_model "code.gitea.io/gitea/models/actions" @@ -20,6 +18,7 @@ import ( "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" @@ -314,6 +313,7 @@ func prepareWorkflowList(ctx *context.Context, workflows []Workflow) { pager.AddParamFromRequest(ctx.Req) ctx.Data["Page"] = pager ctx.Data["HasWorkflowsOrRuns"] = len(workflows) > 0 || len(runs) > 0 + ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin) } // loadIsRefDeleted loads the IsRefDeleted field for each run in the list. @@ -427,29 +427,38 @@ func decodeNode(node yaml.Node, out any) bool { return true } -func DeleteRun(ctx *context.Context) { - actionRunIDStr := ctx.PathParam("id") - if len(actionRunIDStr) < 1 { +func DeleteRuns(ctx *context.Context) { + rd := ctx.Req.Body + defer rd.Close() + + req := DeleteRunsRequest{} + if err := json.NewDecoder(rd).Decode(&req); err != nil { + ctx.ServerError("failed to decode request body into delte runs request", err) + return + } + if len(req.ActionIDs) < 1 { ctx.ServerError("missing action_run.id for delete action run", nil) return } - actionRunID, err := strconv.ParseInt(actionRunIDStr, 10, 64) - if err != nil { - ctx.ServerError("failed to casting action_run.id string to int64", err) - return - } - actionRun, err := actions_model.GetRunByID(ctx, actionRunID) + actionRun, err := actions_model.GetRunsByIDs(ctx, req.ActionIDs) if err != nil { ctx.ServerError("failed to get action_run", err) return } - err = actions_model.DeleteRunByID(ctx, actionRun.ID) + + if len(actionRun) != len(req.ActionIDs) { + ctx.ServerError("action ids not match with request", nil) + } + + err = actions_model.DeleteRunByIDs(ctx, req.ActionIDs) if err != nil { ctx.ServerError("failed to delete action_run", err) return } - ctx.JSON(http.StatusOK, map[string]any{ - "redirect": fmt.Sprintf("%s/actions", ctx.Repo.RepoLink), - }) + ctx.Status(http.StatusNoContent) +} + +type DeleteRunsRequest struct { + ActionIDs []int64 `json:"actionIds"` } diff --git a/routers/web/web.go b/routers/web/web.go index 2bc49efc55..6324e421ac 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1435,7 +1435,7 @@ func registerRoutes(m *web.Router) { m.Get("/badge.svg", actions.GetWorkflowBadge) }) - m.Delete("/runs/{id}", reqRepoActionsWriter, actions.DeleteRun) + m.Post("/runs/delete", reqRepoActionsWriter, actions.DeleteRuns) }, optSignIn, context.RepoAssignment, repo.MustBeNotEmpty, reqRepoActionsReader, actions.MustEnableActions) // end "/{username}/{reponame}/actions" From 7f511d98130953bfc3c0c7ab8807d5760e0a42dd Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 16:05:24 +0700 Subject: [PATCH 13/28] feat(DeleteRunByIDs): add delete action_task_step, action_task_output, action_task --- models/actions/run.go | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/models/actions/run.go b/models/actions/run.go index ecf02eada0..4786ff992d 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -443,7 +443,26 @@ func DeleteRunByIDs(ctx context.Context, ids []int64) error { return err } defer committer.Close() - _, err = db.GetEngine(ctx).In("id", ids).Delete(ActionRun{}) + + _, err = db.GetEngine(ctx). + Table("action_task"). + Join("INNER", "action_task_step", "action_task.id = action_task_step.task_id"). + In("action_task.job_id", ids). + Delete(ActionTaskStep{}) + if err != nil { + return err + } + + _, err = db.GetEngine(ctx). + Table("action_task"). + Join("INNER", "action_task_output", "action_task.id = action_task_output.task_id"). + In("action_task.job_id", ids). + Delete(ActionTaskOutput{}) + if err != nil { + return err + } + + _, err = db.GetEngine(ctx).In("job_id", ids).Delete(ActionTask{}) if err != nil { return err } @@ -453,6 +472,11 @@ func DeleteRunByIDs(ctx context.Context, ids []int64) error { return err } + _, err = db.GetEngine(ctx).In("id", ids).Delete(ActionRun{}) + if err != nil { + return err + } + return committer.Commit() } From 3faea229b6d90636e8b37e00576f668879bf254b Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 16:13:24 +0700 Subject: [PATCH 14/28] revert --- web_src/js/features/common-button.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts index 3df071d617..3162557b9b 100644 --- a/web_src/js/features/common-button.ts +++ b/web_src/js/features/common-button.ts @@ -1,4 +1,4 @@ -import {DELETE, POST} from '../modules/fetch.ts'; +import {POST} from '../modules/fetch.ts'; import {addDelegatedEventListener, hideElem, queryElems, showElem, toggleElem} from '../utils/dom.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; import {camelize} from 'vue'; @@ -17,7 +17,8 @@ export function initGlobalDeleteButton(): void { // Some model/form elements will be filled by `data-id` / `data-name` / `data-data-xxx` attributes. // If there is a form defined by `data-form`, then the form will be submitted as-is (without any modification). // If there is no form, then the data will be posted to `data-url`. - // TODO: it's not encouraged to use this method. `show-modal` does far better than this. + // TODO: do not use this method in new code. `show-modal` / `link-action(data-modal-confirm)` does far better than this. + // FIXME: all legacy `delete-button` should be refactored to use `show-modal` or `link-action` for (const btn of document.querySelectorAll('.delete-button')) { btn.addEventListener('click', (e) => { e.preventDefault(); @@ -62,10 +63,7 @@ export function initGlobalDeleteButton(): void { } } - const method = btn.getAttribute('data-method')?.toUpperCase() || 'POST'; - const response = method === 'DELETE' ? - await DELETE(btn.getAttribute('data-url')) : - await POST(btn.getAttribute('data-url'), {data: postData}); + const response = await POST(btn.getAttribute('data-url'), {data: postData}); if (response.ok) { const data = await response.json(); window.location.href = data.redirect; From 0b27261d31bf3cedcb3ba61725671d155f932b12 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 16:14:46 +0700 Subject: [PATCH 15/28] revert --- web_src/js/features/common-button.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts index 3162557b9b..acce992b90 100644 --- a/web_src/js/features/common-button.ts +++ b/web_src/js/features/common-button.ts @@ -17,8 +17,7 @@ export function initGlobalDeleteButton(): void { // Some model/form elements will be filled by `data-id` / `data-name` / `data-data-xxx` attributes. // If there is a form defined by `data-form`, then the form will be submitted as-is (without any modification). // If there is no form, then the data will be posted to `data-url`. - // TODO: do not use this method in new code. `show-modal` / `link-action(data-modal-confirm)` does far better than this. - // FIXME: all legacy `delete-button` should be refactored to use `show-modal` or `link-action` + // TODO: it's not encouraged to use this method. `show-modal` does far better than this. for (const btn of document.querySelectorAll('.delete-button')) { btn.addEventListener('click', (e) => { e.preventDefault(); From 050a6b6fb0b4f99b5263e39f29264a45ad72822b Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 16:46:18 +0700 Subject: [PATCH 16/28] feat: add GetRunJobsByRunIDs --- models/actions/run_job.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/models/actions/run_job.go b/models/actions/run_job.go index de4b6aab66..4135059aca 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -184,3 +184,11 @@ func AggregateJobStatus(jobs []*ActionRunJob) Status { return StatusUnknown // it shouldn't happen } } + +func GetRunJobsByRunIDs(ctx context.Context, runIDs []int64) ([]*ActionRunJob, error) { + var jobs []*ActionRunJob + if err := db.GetEngine(ctx).In("run_id", runIDs).Find(&jobs); err != nil { + return nil, err + } + return jobs, nil +} From 5dd6245fa1b07e97eb08ac34f9558373f74c1151 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 16:46:53 +0700 Subject: [PATCH 17/28] fix: job id --- models/actions/run.go | 14 +++++++------- routers/web/repo/actions/actions.go | 12 +++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 4786ff992d..bad611481f 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -436,8 +436,8 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { type ActionRunIndex db.ResourceIndex -// DeleteRunByIDs delete action_run and action_run_job. -func DeleteRunByIDs(ctx context.Context, ids []int64) error { +// DeleteRunByIDs delete action_task_step, action_task_output, action_task, action_run and action_run_job. +func DeleteRunByIDs(ctx context.Context, runIDs, jobIDs []int64) error { ctx, committer, err := db.TxContext(ctx) if err != nil { return err @@ -447,7 +447,7 @@ func DeleteRunByIDs(ctx context.Context, ids []int64) error { _, err = db.GetEngine(ctx). Table("action_task"). Join("INNER", "action_task_step", "action_task.id = action_task_step.task_id"). - In("action_task.job_id", ids). + In("action_task.job_id", jobIDs). Delete(ActionTaskStep{}) if err != nil { return err @@ -456,23 +456,23 @@ func DeleteRunByIDs(ctx context.Context, ids []int64) error { _, err = db.GetEngine(ctx). Table("action_task"). Join("INNER", "action_task_output", "action_task.id = action_task_output.task_id"). - In("action_task.job_id", ids). + In("action_task.job_id", jobIDs). Delete(ActionTaskOutput{}) if err != nil { return err } - _, err = db.GetEngine(ctx).In("job_id", ids).Delete(ActionTask{}) + _, err = db.GetEngine(ctx).In("job_id", jobIDs).Delete(ActionTask{}) if err != nil { return err } - _, err = db.GetEngine(ctx).In("run_id", ids).Delete(ActionRunJob{}) + _, err = db.GetEngine(ctx).In("id", jobIDs).Delete(ActionRunJob{}) if err != nil { return err } - _, err = db.GetEngine(ctx).In("id", ids).Delete(ActionRun{}) + _, err = db.GetEngine(ctx).In("id", runIDs).Delete(ActionRun{}) if err != nil { return err } diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 9a6a142a16..dc013aed1f 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -449,9 +449,19 @@ func DeleteRuns(ctx *context.Context) { if len(actionRun) != len(req.ActionIDs) { ctx.ServerError("action ids not match with request", nil) + return + } + actionRunJobs, err := actions_model.GetRunJobsByRunIDs(ctx, req.ActionIDs) + if err != nil { + ctx.ServerError("failed to get run jobs by run ids", err) + return + } + var jobIDs []int64 + for _, actionRunJob := range actionRunJobs { + jobIDs = append(jobIDs, actionRunJob.ID) } - err = actions_model.DeleteRunByIDs(ctx, req.ActionIDs) + err = actions_model.DeleteRunByIDs(ctx, req.ActionIDs, jobIDs) if err != nil { ctx.ServerError("failed to delete action_run", err) return From 05af60bff7ca03ac59aa42126da035545ab8556e Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 17:11:46 +0700 Subject: [PATCH 18/28] refactor: change to GetRunsByIDsAndTriggerUserID --- models/actions/run.go | 6 ++++-- models/actions/run_test.go | 14 ++++++++++++++ routers/web/repo/actions/actions.go | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 models/actions/run_test.go diff --git a/models/actions/run.go b/models/actions/run.go index bad611481f..28b7312360 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -480,9 +480,11 @@ func DeleteRunByIDs(ctx context.Context, runIDs, jobIDs []int64) error { return committer.Commit() } -func GetRunsByIDs(ctx context.Context, ids []int64) ([]*ActionRun, error) { +// GetRunsByIDsAndTriggerUserID -- get all action run by trigger user with selected ids +func GetRunsByIDsAndTriggerUserID(ctx context.Context, ids []int64, triggerUserID int64) ([]*ActionRun, error) { var runs []*ActionRun - err := db.GetEngine(ctx).In("id", ids).Find(&runs) + err := db.GetEngine(ctx).Where("trigger_user_id=?", triggerUserID). + In("id", ids).Find(&runs) if err != nil { return nil, err } diff --git a/models/actions/run_test.go b/models/actions/run_test.go new file mode 100644 index 0000000000..7b8b8de64d --- /dev/null +++ b/models/actions/run_test.go @@ -0,0 +1,14 @@ +package actions + +import ( + db_model "code.gitea.io/gitea/models/db" + "testing" +) + +func TestDeleteRunByIDs(t *testing.T) { + tests := []struct{ + name string + mock func(m *db_model.Engine) + + } +} diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index dc013aed1f..3d092730cf 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -441,7 +441,7 @@ func DeleteRuns(ctx *context.Context) { return } - actionRun, err := actions_model.GetRunsByIDs(ctx, req.ActionIDs) + actionRun, err := actions_model.GetRunsByIDsAndTriggerUserID(ctx, req.ActionIDs, ctx.Doer.ID) if err != nil { ctx.ServerError("failed to get action_run", err) return From 80377f8ae4321dfaf6f7aeb77f85af5241714a67 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 17:14:04 +0700 Subject: [PATCH 19/28] rm: invalid test --- models/actions/run_test.go | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 models/actions/run_test.go diff --git a/models/actions/run_test.go b/models/actions/run_test.go deleted file mode 100644 index 7b8b8de64d..0000000000 --- a/models/actions/run_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package actions - -import ( - db_model "code.gitea.io/gitea/models/db" - "testing" -) - -func TestDeleteRunByIDs(t *testing.T) { - tests := []struct{ - name string - mock func(m *db_model.Engine) - - } -} From 1390874e358d0863a73d42b0ebfac90c44b69c19 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 18:02:36 +0700 Subject: [PATCH 20/28] feat: add GetRunTasksByJobIDs --- models/actions/run_job.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/models/actions/run_job.go b/models/actions/run_job.go index 4135059aca..17b0fe9c63 100644 --- a/models/actions/run_job.go +++ b/models/actions/run_job.go @@ -192,3 +192,11 @@ func GetRunJobsByRunIDs(ctx context.Context, runIDs []int64) ([]*ActionRunJob, e } return jobs, nil } + +func GetRunTasksByJobIDs(ctx context.Context, jobIDs []int64) ([]*ActionTask, error) { + var tasks []*ActionTask + if err := db.GetEngine(ctx).In("job_id", jobIDs).Find(&tasks); err != nil { + return nil, err + } + return tasks, nil +} From 965087e6a9244f9b43c1b7135f4e4430f7574ad1 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 18:02:58 +0700 Subject: [PATCH 21/28] feat: add removeActionTaskLogFilenames --- routers/web/repo/actions/actions.go | 64 +++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 3d092730cf..cf38424b0b 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -6,7 +6,10 @@ package actions import ( "bytes" stdCtx "context" + "golang.org/x/sync/errgroup" "net/http" + "os" + "path/filepath" "slices" "strings" @@ -441,34 +444,71 @@ func DeleteRuns(ctx *context.Context) { return } - actionRun, err := actions_model.GetRunsByIDsAndTriggerUserID(ctx, req.ActionIDs, ctx.Doer.ID) + var ( + eg = new(errgroup.Group) + actionRuns []*actions_model.ActionRun + actionTasks []*actions_model.ActionTask + jobIDs []int64 + ) + eg.Go(func() error { + var err error + actionRuns, err = actions_model.GetRunsByIDsAndTriggerUserID(ctx, req.ActionIDs, ctx.Doer.ID) + return err + }) + + eg.Go(func() error { + actionRunJobs, err := actions_model.GetRunJobsByRunIDs(ctx, req.ActionIDs) + if err != nil { + return err + } + + for _, actionRunJob := range actionRunJobs { + jobIDs = append(jobIDs, actionRunJob.ID) + } + actionTasks, err = actions_model.GetRunTasksByJobIDs(ctx, jobIDs) + return err + }) + + err := eg.Wait() if err != nil { - ctx.ServerError("failed to get action_run", err) + ctx.ServerError("failed to get action runs and action run jobs", err) return } - if len(actionRun) != len(req.ActionIDs) { + if len(actionRuns) != len(req.ActionIDs) { ctx.ServerError("action ids not match with request", nil) return } - actionRunJobs, err := actions_model.GetRunJobsByRunIDs(ctx, req.ActionIDs) - if err != nil { - ctx.ServerError("failed to get run jobs by run ids", err) - return - } - var jobIDs []int64 - for _, actionRunJob := range actionRunJobs { - jobIDs = append(jobIDs, actionRunJob.ID) - } err = actions_model.DeleteRunByIDs(ctx, req.ActionIDs, jobIDs) if err != nil { ctx.ServerError("failed to delete action_run", err) return } + + removeActionTaskLogFilenames(actionTasks) + ctx.Status(http.StatusNoContent) } type DeleteRunsRequest struct { ActionIDs []int64 `json:"actionIds"` } + +func removeActionTaskLogFilenames(actionTasks []*actions_model.ActionTask) { + dirNameActionLog := "actions_log" + go func() { + for _, actionTask := range actionTasks { + var fileName string + if filepath.IsAbs(setting.AppDataPath) { + fileName = filepath.Join(setting.AppDataPath, dirNameActionLog, actionTask.LogFilename) + } else { + fileName = filepath.Join(setting.AppWorkPath, setting.AppDataPath, dirNameActionLog, actionTask.LogFilename) + } + + if err := os.Remove(fileName); err != nil { + log.Error("failed to remove actions_log file %s: %v", fileName, err) + } + } + }() +} From 71b773ac2e04c09e1a51441bb1e16daee4ed96f3 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Wed, 8 Jan 2025 18:34:52 +0700 Subject: [PATCH 22/28] fix: lint --- routers/web/repo/actions/actions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index cf38424b0b..48d74450d9 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -6,7 +6,6 @@ package actions import ( "bytes" stdCtx "context" - "golang.org/x/sync/errgroup" "net/http" "os" "path/filepath" @@ -32,6 +31,7 @@ import ( "code.gitea.io/gitea/services/convert" "github.com/nektos/act/pkg/model" + "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3" ) From 1a7a7e71278fcd3ff1f0ea89cca468cb83904a2c Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 05:33:29 +0700 Subject: [PATCH 23/28] refactor: change to DeleteActionRunAndChild --- models/actions/run.go | 16 +++++---------- routers/web/repo/actions/actions.go | 32 ++++++++++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 28b7312360..48a200dc39 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -436,33 +436,27 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error { type ActionRunIndex db.ResourceIndex -// DeleteRunByIDs delete action_task_step, action_task_output, action_task, action_run and action_run_job. -func DeleteRunByIDs(ctx context.Context, runIDs, jobIDs []int64) error { +// DeleteActionRunAndChild delete action_task_step, action_task_output, action_task, action_run and action_run_job. +func DeleteActionRunAndChild(ctx context.Context, runIDs, jobIDs, taskIDs []int64) error { ctx, committer, err := db.TxContext(ctx) if err != nil { return err } defer committer.Close() - _, err = db.GetEngine(ctx). - Table("action_task"). - Join("INNER", "action_task_step", "action_task.id = action_task_step.task_id"). - In("action_task.job_id", jobIDs). + _, err = db.GetEngine(ctx).In("task_id", taskIDs). Delete(ActionTaskStep{}) if err != nil { return err } - _, err = db.GetEngine(ctx). - Table("action_task"). - Join("INNER", "action_task_output", "action_task.id = action_task_output.task_id"). - In("action_task.job_id", jobIDs). + _, err = db.GetEngine(ctx).In("task_id", taskIDs). Delete(ActionTaskOutput{}) if err != nil { return err } - _, err = db.GetEngine(ctx).In("job_id", jobIDs).Delete(ActionTask{}) + _, err = db.GetEngine(ctx).In("id", taskIDs).Delete(ActionTask{}) if err != nil { return err } diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 48d74450d9..876d9915bf 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -445,10 +445,10 @@ func DeleteRuns(ctx *context.Context) { } var ( - eg = new(errgroup.Group) - actionRuns []*actions_model.ActionRun - actionTasks []*actions_model.ActionTask - jobIDs []int64 + eg = new(errgroup.Group) + actionRuns []*actions_model.ActionRun + jobIDs, taskIDs []int64 + taskLogFileNames []string ) eg.Go(func() error { var err error @@ -465,8 +465,16 @@ func DeleteRuns(ctx *context.Context) { for _, actionRunJob := range actionRunJobs { jobIDs = append(jobIDs, actionRunJob.ID) } - actionTasks, err = actions_model.GetRunTasksByJobIDs(ctx, jobIDs) - return err + actionTasks, err := actions_model.GetRunTasksByJobIDs(ctx, jobIDs) + if err != nil { + return err + } + + for _, actionTask := range actionTasks { + taskIDs = append(taskIDs, actionTask.ID) + taskLogFileNames = append(taskLogFileNames, actionTask.LogFilename) + } + return nil }) err := eg.Wait() @@ -480,13 +488,13 @@ func DeleteRuns(ctx *context.Context) { return } - err = actions_model.DeleteRunByIDs(ctx, req.ActionIDs, jobIDs) + err = actions_model.DeleteActionRunAndChild(ctx, req.ActionIDs, jobIDs, taskIDs) if err != nil { ctx.ServerError("failed to delete action_run", err) return } - removeActionTaskLogFilenames(actionTasks) + removeActionTaskLogFilenames(taskLogFileNames) ctx.Status(http.StatusNoContent) } @@ -495,15 +503,15 @@ type DeleteRunsRequest struct { ActionIDs []int64 `json:"actionIds"` } -func removeActionTaskLogFilenames(actionTasks []*actions_model.ActionTask) { +func removeActionTaskLogFilenames(taskLogFileNames []string) { dirNameActionLog := "actions_log" go func() { - for _, actionTask := range actionTasks { + for _, taskLogFileName := range taskLogFileNames { var fileName string if filepath.IsAbs(setting.AppDataPath) { - fileName = filepath.Join(setting.AppDataPath, dirNameActionLog, actionTask.LogFilename) + fileName = filepath.Join(setting.AppDataPath, dirNameActionLog, taskLogFileName) } else { - fileName = filepath.Join(setting.AppWorkPath, setting.AppDataPath, dirNameActionLog, actionTask.LogFilename) + fileName = filepath.Join(setting.AppWorkPath, setting.AppDataPath, dirNameActionLog, taskLogFileName) } if err := os.Remove(fileName); err != nil { From 8c742ab72a415a9a5628b21762ca01da02bace92 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 08:35:29 +0700 Subject: [PATCH 24/28] test(integration): add TestRepoActionDelete --- .../api_repo_action_delete_test.go | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 tests/integration/api_repo_action_delete_test.go diff --git a/tests/integration/api_repo_action_delete_test.go b/tests/integration/api_repo_action_delete_test.go new file mode 100644 index 0000000000..06b680e2b4 --- /dev/null +++ b/tests/integration/api_repo_action_delete_test.go @@ -0,0 +1,225 @@ +package integration + +import ( + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/tests" + "fmt" + "github.com/PuerkitoBio/goquery" + "net/http" + "net/url" + "strconv" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestRepoActionDelete(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + testCases := []struct { + treePath string + fileContent string + outcomes map[string]*mockTaskOutcome + expectedTaskNeeds map[string]*runnerv1.TaskNeed // jobID => TaskNeed + }{ + { + treePath: ".gitea/workflows/jobs-outputs-with-matrix.yml", + fileContent: `name: jobs-outputs-with-matrix +on: + push: + paths: + - '.gitea/workflows/jobs-outputs-with-matrix.yml' +jobs: + job1: + runs-on: ubuntu-latest + outputs: + output_1: ${{ steps.gen_output.outputs.output_1 }} + output_2: ${{ steps.gen_output.outputs.output_2 }} + output_3: ${{ steps.gen_output.outputs.output_3 }} + strategy: + matrix: + version: [1, 2, 3] + steps: + - name: Generate output + id: gen_output + run: | + version="${{ matrix.version }}" + echo "output_${version}=${version}" >> "$GITHUB_OUTPUT" + job2: + runs-on: ubuntu-latest + needs: [job1] + steps: + - run: echo '${{ toJSON(needs.job1.outputs) }}' +`, + outcomes: map[string]*mockTaskOutcome{ + "job1 (1)": { + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "output_1": "1", + "output_2": "", + "output_3": "", + }, + }, + "job1 (2)": { + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "output_1": "", + "output_2": "2", + "output_3": "", + }, + }, + "job1 (3)": { + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "output_1": "", + "output_2": "", + "output_3": "3", + }, + }, + }, + expectedTaskNeeds: map[string]*runnerv1.TaskNeed{ + "job1": { + Result: runnerv1.Result_RESULT_SUCCESS, + Outputs: map[string]string{ + "output_1": "1", + "output_2": "2", + "output_3": "3", + }, + }, + }, + }, + { + treePath: ".gitea/workflows/jobs-outputs-with-matrix-failure.yml", + fileContent: `name: jobs-outputs-with-matrix-failure +on: + push: + paths: + - '.gitea/workflows/jobs-outputs-with-matrix-failure.yml' +jobs: + job1: + runs-on: ubuntu-latest + outputs: + output_1: ${{ steps.gen_output.outputs.output_1 }} + output_2: ${{ steps.gen_output.outputs.output_2 }} + output_3: ${{ steps.gen_output.outputs.output_3 }} + strategy: + matrix: + version: [1, 2, 3] + steps: + - name: Generate output + id: gen_output + run: | + version="${{ matrix.version }}" + echo "output_${version}=${version}" >> "$GITHUB_OUTPUT" + job2: + runs-on: ubuntu-latest + if: ${{ always() }} + needs: [job1] + steps: + - run: echo '${{ toJSON(needs.job1.outputs) }}' +`, + outcomes: map[string]*mockTaskOutcome{ + "job1 (1)": { + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "output_1": "1", + "output_2": "", + "output_3": "", + }, + }, + "job1 (2)": { + result: runnerv1.Result_RESULT_FAILURE, + outputs: map[string]string{ + "output_1": "", + "output_2": "", + "output_3": "", + }, + }, + "job1 (3)": { + result: runnerv1.Result_RESULT_SUCCESS, + outputs: map[string]string{ + "output_1": "", + "output_2": "", + "output_3": "3", + }, + }, + }, + expectedTaskNeeds: map[string]*runnerv1.TaskNeed{ + "job1": { + Result: runnerv1.Result_RESULT_FAILURE, + Outputs: map[string]string{ + "output_1": "1", + "output_2": "", + "output_3": "3", + }, + }, + }, + }, + } + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + session := loginUser(t, user2.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) + + apiRepo := createActionsTestRepo(t, token, "actions-jobs-outputs-with-matrix", false) + runner := newMockRunner() + runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"}) + + for _, tc := range testCases { + t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) { + opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent) + createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts) + + for i := 0; i < len(tc.outcomes); i++ { + task := runner.fetchTask(t) + jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id) + outcome := tc.outcomes[jobName] + assert.NotNil(t, outcome) + runner.execTask(t, task, outcome) + } + + task := runner.fetchTask(t) + actualTaskNeeds := task.Needs + assert.Len(t, actualTaskNeeds, len(tc.expectedTaskNeeds)) + for jobID, tn := range tc.expectedTaskNeeds { + actualNeed := actualTaskNeeds[jobID] + assert.Equal(t, tn.Result, actualNeed.Result) + assert.Len(t, actualNeed.Outputs, len(tn.Outputs)) + for outputKey, outputValue := range tn.Outputs { + assert.Equal(t, outputValue, actualNeed.Outputs[outputKey]) + } + } + }) + } + httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository) + // check result + req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/actions", httpContext.Username, httpContext.Reponame)) + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + var runIDs []int64 + list := htmlDoc.doc.Find("#action-actions input.action-checkbox:not(:disabled)") + list.Each(func(i int, s *goquery.Selection) { + idStr, exists := s.Attr("data-action-id") + if exists { + runID, err := strconv.ParseInt(idStr, 10, 64) + assert.NoError(t, err) + runIDs = append(runIDs, runID) + } + }) + + assert.NotEmpty(t, runIDs) + csrf := GetUserCSRFToken(t, session) + reqDelete := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/%s/%s/actions/runs/delete", httpContext.Username, httpContext.Reponame), map[string]interface{}{ + "actionIds": runIDs, + "_csrf": csrf, + }).AddTokenAuth(token). + SetHeader("X-Csrf-Token", csrf) + session.MakeRequest(t, reqDelete, http.StatusNoContent) + doAPIDeleteRepository(httpContext) + }) + +} From e17f73aae291e0b98427eaa5fb1d82d6374c4be0 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 09:04:05 +0700 Subject: [PATCH 25/28] test(integration): add assert error equal --- tests/integration/api_repo_action_delete_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/integration/api_repo_action_delete_test.go b/tests/integration/api_repo_action_delete_test.go index 06b680e2b4..f4fcd71d25 100644 --- a/tests/integration/api_repo_action_delete_test.go +++ b/tests/integration/api_repo_action_delete_test.go @@ -2,10 +2,13 @@ package integration import ( runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + actions_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/tests" + "context" "fmt" "github.com/PuerkitoBio/goquery" "net/http" @@ -219,6 +222,10 @@ jobs: }).AddTokenAuth(token). SetHeader("X-Csrf-Token", csrf) session.MakeRequest(t, reqDelete, http.StatusNoContent) + + // should not found + _, err := actions_model.GetRunsByIDsAndTriggerUserID(context.Background(), runIDs, user2.ID) + assert.Error(t, fmt.Errorf("run with ids %d: %w", runIDs, util.ErrNotExist), err) doAPIDeleteRepository(httpContext) }) From 95924a17b9c19088137c372c46f01f1d057ef115 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 09:28:30 +0700 Subject: [PATCH 26/28] fix: lint --- .../api_repo_action_delete_test.go | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/integration/api_repo_action_delete_test.go b/tests/integration/api_repo_action_delete_test.go index f4fcd71d25..0b67412955 100644 --- a/tests/integration/api_repo_action_delete_test.go +++ b/tests/integration/api_repo_action_delete_test.go @@ -1,6 +1,16 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + package integration import ( + "context" + "fmt" + "net/http" + "net/url" + "strconv" + "testing" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" actions_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" @@ -8,13 +18,8 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/tests" - "context" - "fmt" + "github.com/PuerkitoBio/goquery" - "net/http" - "net/url" - "strconv" - "testing" "github.com/stretchr/testify/assert" ) @@ -225,8 +230,7 @@ jobs: // should not found _, err := actions_model.GetRunsByIDsAndTriggerUserID(context.Background(), runIDs, user2.ID) - assert.Error(t, fmt.Errorf("run with ids %d: %w", runIDs, util.ErrNotExist), err) + assert.EqualError(t, err, fmt.Errorf("run with ids %d: %w", runIDs, util.ErrNotExist).Error()) doAPIDeleteRepository(httpContext) }) - } From f3895299508e2c6a2c1d1f6fde785c4e4888aa53 Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 09:42:23 +0700 Subject: [PATCH 27/28] fix: job --- tests/integration/api_repo_action_delete_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/api_repo_action_delete_test.go b/tests/integration/api_repo_action_delete_test.go index 0b67412955..e7efc12d75 100644 --- a/tests/integration/api_repo_action_delete_test.go +++ b/tests/integration/api_repo_action_delete_test.go @@ -11,7 +11,6 @@ import ( "strconv" "testing" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" actions_model "code.gitea.io/gitea/models/actions" auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/unittest" @@ -19,6 +18,7 @@ import ( "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/tests" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" @@ -221,7 +221,7 @@ jobs: assert.NotEmpty(t, runIDs) csrf := GetUserCSRFToken(t, session) - reqDelete := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/%s/%s/actions/runs/delete", httpContext.Username, httpContext.Reponame), map[string]interface{}{ + reqDelete := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/%s/%s/actions/runs/delete", httpContext.Username, httpContext.Reponame), map[string]any{ "actionIds": runIDs, "_csrf": csrf, }).AddTokenAuth(token). From 530360bd1a4fdad0a3a29639b54da907f845a36f Mon Sep 17 00:00:00 2001 From: zsbahtiar Date: Thu, 9 Jan 2025 09:55:09 +0700 Subject: [PATCH 28/28] fix: check backend --- tests/integration/api_repo_action_delete_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/api_repo_action_delete_test.go b/tests/integration/api_repo_action_delete_test.go index e7efc12d75..13461169a8 100644 --- a/tests/integration/api_repo_action_delete_test.go +++ b/tests/integration/api_repo_action_delete_test.go @@ -20,7 +20,6 @@ import ( runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "github.com/PuerkitoBio/goquery" - "github.com/stretchr/testify/assert" )