From 028102ff4771b5ae6c88b14ccbd446630a9a7274 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 4 Dec 2023 02:19:49 +0000 Subject: [PATCH 1/5] show workflow names on other branchs also quick fix #28332, do it by a quick check in `ActionRun` table. TODO: looks need more jobs about workflow lables check in future. Signed-off-by: a1012112796 <1012112796@qq.com> --- models/actions/main_test.go | 1 + models/actions/run.go | 13 +++++++++++++ models/actions/run_test.go | 22 ++++++++++++++++++++++ routers/web/repo/actions/actions.go | 28 +++++++++++++++++++++++++++- templates/repo/actions/list.tmpl | 4 ++-- 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 models/actions/run_test.go diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 5d5089e3bba88..0730c283a8bba 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -13,6 +13,7 @@ func TestMain(m *testing.M) { unittest.MainTest(m, &unittest.TestOptions{ FixtureFiles: []string{ "action_runner_token.yml", + "action_run.yml", }, }) } diff --git a/models/actions/run.go b/models/actions/run.go index 4656aa22a2933..a8699e7bfb39c 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -132,6 +132,19 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) { return nil, fmt.Errorf("event %s is not a push event", run.Event) } +func FindWorkflowIDsByRepoID(ctx context.Context, repoID int64) ([]string, error) { + ids := make([]string, 0, 10) + + err := db.GetEngine(ctx).Table(new(ActionRun)).Where("repo_id = ?", repoID). + Select("workflow_id").Distinct("workflow_id").Find(&ids) + + if err != nil { + return nil, err + } + + return ids, nil +} + func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) { if run.Event == webhook_module.HookEventPullRequest || run.Event == webhook_module.HookEventPullRequestSync { var payload api.PullRequestPayload diff --git a/models/actions/run_test.go b/models/actions/run_test.go new file mode 100644 index 0000000000000..98274f6e7e310 --- /dev/null +++ b/models/actions/run_test.go @@ -0,0 +1,22 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" + + "github.com/stretchr/testify/assert" +) + +func TestFindWorkflowIDsByRepoID(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + ids, err := FindWorkflowIDsByRepoID(db.DefaultContext, 4) + assert.NoError(t, err) + + assert.EqualValues(t, []string{"artifact.yaml"}, ids) +} diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index fd541647b716e..994a2a2c12a11 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/web/repo" "code.gitea.io/gitea/services/convert" @@ -32,6 +33,7 @@ const ( type Workflow struct { Entry git.TreeEntry ErrMsg string + Name string } // MustEnableActions check if actions are enabled in settings @@ -90,7 +92,7 @@ func List(ctx *context.Context) { workflows = make([]Workflow, 0, len(entries)) for _, entry := range entries { - workflow := Workflow{Entry: *entry} + workflow := Workflow{Entry: *entry, Name: entry.Name()} content, err := actions.GetContentFromEntry(entry) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) @@ -124,6 +126,30 @@ func List(ctx *context.Context) { workflows = append(workflows, workflow) } } + + // recheck workflow ids by runs because not all workflows in default branch + ids, err := actions_model.FindWorkflowIDsByRepoID(ctx, ctx.Repo.Repository.ID) + if err != nil { + log.Error("actions_model.FindWorkflowIDsByRepoID: %v", err) + } + + for _, id := range ids { + found := false + + for _, wf := range workflows { + if wf.Name == id { + found = true + break + } + } + + if found { + continue + } + + workflows = append(workflows, Workflow{Name: id}) + } + ctx.Data["workflows"] = workflows ctx.Data["RepoLink"] = ctx.Repo.Repository.Link() diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 62d30305b3603..ad43bc6836fb9 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -10,14 +10,14 @@
{{ctx.Locale.Tr "actions.runs.all_workflows"}} {{range .workflows}} - {{.Entry.Name}} + {{.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} {{end}} - {{if $.ActionsConfig.IsWorkflowDisabled .Entry.Name}} + {{if $.ActionsConfig.IsWorkflowDisabled .Name}}
{{ctx.Locale.Tr "disabled"}}
{{end}} From 5454a1201aa3b1629e761b1a03088c7240f5518e Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 4 Dec 2023 02:59:46 +0000 Subject: [PATCH 2/5] fmt Signed-off-by: a1012112796 <1012112796@qq.com> --- models/actions/run.go | 1 - 1 file changed, 1 deletion(-) diff --git a/models/actions/run.go b/models/actions/run.go index a8699e7bfb39c..a1970d822ea43 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -137,7 +137,6 @@ func FindWorkflowIDsByRepoID(ctx context.Context, repoID int64) ([]string, error err := db.GetEngine(ctx).Table(new(ActionRun)).Where("repo_id = ?", repoID). Select("workflow_id").Distinct("workflow_id").Find(&ids) - if err != nil { return nil, err } From f0e1fa436655a2ec19e3ba70adb5479eba298b4d Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Tue, 5 Dec 2023 02:36:37 +0000 Subject: [PATCH 3/5] enhancement: check workflow on push follow #28333, check workflow when pushing to branch and save the result in database, when view the actions list, can get result from database quickly. Signed-off-by: a1012112796 <1012112796@qq.com> --- models/actions/run.go | 1 + models/actions/workflow.go | 176 ++++++++++++++++++++++++++++ models/actions/workflow_test.go | 46 ++++++++ modules/actions/workflows.go | 66 +++++++++++ options/locale/locale_en-US.ini | 3 +- routers/web/repo/actions/actions.go | 107 ++++------------- services/repository/delete.go | 1 + services/repository/push.go | 12 ++ 8 files changed, 328 insertions(+), 84 deletions(-) create mode 100644 models/actions/workflow.go create mode 100644 models/actions/workflow_test.go diff --git a/models/actions/run.go b/models/actions/run.go index a1970d822ea43..05afa1adfccde 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -55,6 +55,7 @@ type ActionRun struct { func init() { db.RegisterModel(new(ActionRun)) db.RegisterModel(new(ActionRunIndex)) + db.RegisterModel(new(ActionWorkflow)) } func (run *ActionRun) HTMLURL() string { diff --git a/models/actions/workflow.go b/models/actions/workflow.go new file mode 100644 index 0000000000000..6484b0ca6fe1b --- /dev/null +++ b/models/actions/workflow.go @@ -0,0 +1,176 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "context" + "sort" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/container" +) + +type WorkflowBranch struct { + Branch string + Labels []string + ErrMsg string +} + +type ActionWorkflow struct { + ID int64 `xorm:"pk autoincr"` + RepoID int64 + Name string + Branchs []*WorkflowBranch `xorm:"JSON TEXT"` + ErrMsg string `json:"-"` // for ui logic +} + +func (w *ActionWorkflow) LoadLabels() []string { + labelsSet := make(container.Set[string]) + + for _, b := range w.Branchs { + for _, l := range b.Labels { + labelsSet.AddMultiple(l) + } + } + + labels := labelsSet.Values() + sort.Slice(labels, func(i, j int) bool { + return labels[i] < labels[j] + }) + + return labels +} + +func (w *ActionWorkflow) UpdateBranchLabels(branch string, labels []string) { + if w.Branchs == nil { + w.Branchs = make([]*WorkflowBranch, 0, 5) + } + + for _, b := range w.Branchs { + if b.Branch == branch { + b.Labels = labels + return + } + } + + w.Branchs = append(w.Branchs, &WorkflowBranch{Branch: branch, Labels: labels}) +} + +func (w *ActionWorkflow) UpdateBranchErrMsg(branch string, errMsg error) { + if w.Branchs == nil { + w.Branchs = make([]*WorkflowBranch, 0, 5) + } + + for _, b := range w.Branchs { + if b.Branch == branch { + if errMsg == nil { + b.ErrMsg = "" + } else { + b.ErrMsg = errMsg.Error() + } + return + } + } + + w.Branchs = append(w.Branchs, &WorkflowBranch{Branch: branch, ErrMsg: errMsg.Error()}) +} + +func (w *ActionWorkflow) DeleteBranch(branch string) { + for index, b := range w.Branchs { + if b.Branch == branch { + w.Branchs = append(w.Branchs[:index], w.Branchs[index+1:]...) + break + } + } +} + +func (w *ActionWorkflow) BranchNum() int { + return len(w.Branchs) +} + +func UpdateWorkFlowErrMsg(ctx context.Context, repoID int64, workflow, branch string, err error) error { + return updateWorkFlowLabelsOrErrmsg(ctx, repoID, workflow, branch, nil, err) +} + +func UpdateWorkFlowLabels(ctx context.Context, repoID int64, workflow, branch string, labels []string) error { + return updateWorkFlowLabelsOrErrmsg(ctx, repoID, workflow, branch, labels, nil) +} + +func updateWorkFlowLabelsOrErrmsg(ctx context.Context, repoID int64, workflow, branch string, labels []string, errMsg error) error { + ctx, committer, err := db.TxContext(ctx) + if err != nil { + return err + } + defer committer.Close() + + w := &ActionWorkflow{ + RepoID: repoID, + Name: workflow, + } + has, err := db.GetEngine(ctx).Get(w) + if err != nil { + return err + } + + if len(labels) > 0 { + w.UpdateBranchLabels(branch, labels) + } + + w.UpdateBranchErrMsg(branch, errMsg) + + if has { + _, err = db.GetEngine(ctx).Cols("branchs").ID(w.ID).Update(w) + } else { + _, err = db.GetEngine(ctx).Insert(w) + } + if err != nil { + return err + } + + return committer.Commit() +} + +func DeleteWorkFlowBranch(ctx context.Context, repoID int64, workflow, branch string) error { + ctx, committer, err := db.TxContext(ctx) + if err != nil { + return err + } + defer committer.Close() + + w := &ActionWorkflow{ + RepoID: repoID, + Name: workflow, + } + has, err := db.GetEngine(ctx).Get(w) + if err != nil { + return err + } + if !has { + return nil + } + + w.DeleteBranch(branch) + + if w.BranchNum() == 0 { + _, err = db.GetEngine(ctx).ID(w.ID).Delete(w) + } else { + _, err = db.GetEngine(ctx).Cols("branchs").ID(w.ID).Update(w) + } + if err != nil { + return err + } + + return committer.Commit() +} + +func ListWorkflowBranchs(ctx context.Context, repoID int64) ([]*ActionWorkflow, error) { + result := make([]*ActionWorkflow, 0, 10) + + err := db.GetEngine(ctx).Where("repo_id = ?", repoID).Find(&result) + if err != nil { + return nil, err + } + + return result, nil +} diff --git a/models/actions/workflow_test.go b/models/actions/workflow_test.go new file mode 100644 index 0000000000000..74f3fdf0e3ecc --- /dev/null +++ b/models/actions/workflow_test.go @@ -0,0 +1,46 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" + + "github.com/stretchr/testify/assert" +) + +func TestWorkFlowLabels(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + // test update + err := UpdateWorkFlowLabels(db.DefaultContext, 2, "test-workflow-2.yml", "test1", []string{"aa", "bb"}) + assert.NoError(t, err) + + w := unittest.AssertExistsAndLoadBean(t, &ActionWorkflow{RepoID: 2, Name: "test-workflow-2.yml"}) + assert.EqualValues(t, []string{"aa", "bb"}, w.LoadLabels()) + + err = UpdateWorkFlowLabels(db.DefaultContext, 2, "test-workflow-2.yml", "test2", []string{"aa", "bb", "cccc"}) + assert.NoError(t, err) + + w = unittest.AssertExistsAndLoadBean(t, &ActionWorkflow{RepoID: 2, Name: "test-workflow-2.yml"}) + assert.EqualValues(t, []string{"aa", "bb", "cccc"}, w.LoadLabels()) + + err = UpdateWorkFlowLabels(db.DefaultContext, 2, "test-workflow-2.yml", "test2", []string{"aa", "bb", "dddd"}) + assert.NoError(t, err) + + w = unittest.AssertExistsAndLoadBean(t, &ActionWorkflow{RepoID: 2, Name: "test-workflow-2.yml"}) + assert.EqualValues(t, []string{"aa", "bb", "dddd"}, w.LoadLabels()) + + // test delete + err = DeleteWorkFlowBranch(db.DefaultContext, 2, "test-workflow-2.yml", "test2") + assert.NoError(t, err) + w = unittest.AssertExistsAndLoadBean(t, &ActionWorkflow{RepoID: 2, Name: "test-workflow-2.yml"}) + assert.EqualValues(t, []string{"aa", "bb"}, w.LoadLabels()) + + err = DeleteWorkFlowBranch(db.DefaultContext, 2, "test-workflow-2.yml", "test1") + assert.NoError(t, err) + unittest.AssertNotExistsBean(t, &ActionWorkflow{RepoID: 2, Name: "test-workflow-2.yml"}) +} diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 408fdb8f8ef22..bc0db3355cebd 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -5,9 +5,13 @@ package actions import ( "bytes" + "context" "io" "strings" + actions_model "code.gitea.io/gitea/models/actions" + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" @@ -654,3 +658,65 @@ func matchPackageEvent(commit *git.Commit, payload *api.PackagePayload, evt *job } return matchTimes == len(evt.Acts()) } + +func UpdateWorkflowBranchLabelsForBranch(ctx context.Context, gitRepo *git.Repository, repo *repo_model.Repository, branch string) error { + commit, err := gitRepo.GetBranchCommit(branch) + if err != nil { + return err + } + + entries, err := ListWorkflows(commit) + if err != nil { + return err + } + + for _, entry := range entries { + content, err := GetContentFromEntry(entry) + if err != nil { + return err + } + wf, err := model.ReadWorkflow(bytes.NewReader(content)) + if err != nil { + err = actions_model.UpdateWorkFlowErrMsg(ctx, repo.ID, entry.Name(), branch, err) + if err != nil { + log.Error("actions_model.UpdateWorkFlowErrMsg: %v", err) + } + continue + } + + // Check whether have matching runner + labelsSet := make(container.Set[string]) + + for _, j := range wf.Jobs { + labelsSet.AddMultiple(j.RunsOn()...) + } + + err = actions_model.UpdateWorkFlowLabels(ctx, repo.ID, entry.Name(), branch, labelsSet.Values()) + if err != nil { + log.Error("actions_model.UpdateWorkFlowLabels: %v", err) + } + } + + return nil +} + +func DeleteWorkflowBranchLabelsForBranch(ctx context.Context, gitRepo *git.Repository, repo *repo_model.Repository, oldCommitID, branch string) error { + oldCommit, err := gitRepo.GetCommit(oldCommitID) + if err != nil { + return err + } + + entries, err := ListWorkflows(oldCommit) + if err != nil { + return err + } + + for _, entry := range entries { + err = actions_model.DeleteWorkFlowBranch(ctx, repo.ID, entry.Name(), branch) + if err != nil { + log.Error("actions_model.UpdateWorkFlowLabels: %v", err) + } + } + + return nil +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9c582a885013d..459a17c9676f4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3523,7 +3523,8 @@ runs.commit = Commit runs.scheduled = Scheduled runs.pushed_by = pushed by runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s -runs.no_matching_runner_helper = No matching runner: %s +runs.invalid_workflow_helper_branch = Workflow config file on branch %s is invalid. Please check your config file: %s +runs.no_matching_runner_helper = No matching runner on branch %s : %s runs.actor = Actor runs.status = Status runs.actors_no_select = All actors diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 994a2a2c12a11..daa7dbd91445a 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -4,25 +4,19 @@ package actions import ( - "bytes" "fmt" "net/http" - "strings" actions_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/container" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers/web/repo" "code.gitea.io/gitea/services/convert" - - "github.com/nektos/act/pkg/model" ) const ( @@ -60,94 +54,41 @@ func List(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsActions"] = true - var workflows []Workflow - if empty, err := ctx.Repo.GitRepo.IsEmpty(); err != nil { + workflows, err := actions_model.ListWorkflowBranchs(ctx, ctx.Repo.Repository.ID) + if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return - } else if !empty { - commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - entries, err := actions.ListWorkflows(commit) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - // Get all runner labels - runners, err := db.Find[actions_model.ActionRunner](ctx, actions_model.FindRunnerOptions{ - RepoID: ctx.Repo.Repository.ID, - WithAvailable: true, - }) - if err != nil { - ctx.ServerError("FindRunners", err) - return - } - allRunnerLabels := make(container.Set[string]) - for _, r := range runners { - allRunnerLabels.AddMultiple(r.AgentLabels...) - } - - workflows = make([]Workflow, 0, len(entries)) - for _, entry := range entries { - workflow := Workflow{Entry: *entry, Name: entry.Name()} - content, err := actions.GetContentFromEntry(entry) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - wf, err := model.ReadWorkflow(bytes.NewReader(content)) - if err != nil { - workflow.ErrMsg = ctx.Locale.Tr("actions.runs.invalid_workflow_helper", err.Error()) - workflows = append(workflows, workflow) - continue - } - // Check whether have matching runner - for _, j := range wf.Jobs { - runsOnList := j.RunsOn() - for _, ro := range runsOnList { - if strings.Contains(ro, "${{") { - // Skip if it contains expressions. - // The expressions could be very complex and could not be evaluated here, - // so just skip it, it's OK since it's just a tooltip message. - continue - } - if !allRunnerLabels.Contains(ro) { - workflow.ErrMsg = ctx.Locale.Tr("actions.runs.no_matching_runner_helper", ro) - break - } - } - if workflow.ErrMsg != "" { - break - } - } - workflows = append(workflows, workflow) - } } - // recheck workflow ids by runs because not all workflows in default branch - ids, err := actions_model.FindWorkflowIDsByRepoID(ctx, ctx.Repo.Repository.ID) + // Get all runner labels + runners, err := db.Find[actions_model.ActionRunner](ctx, actions_model.FindRunnerOptions{ + RepoID: ctx.Repo.Repository.ID, + WithAvailable: true, + }) if err != nil { - log.Error("actions_model.FindWorkflowIDsByRepoID: %v", err) + ctx.ServerError("FindRunners", err) + return + } + allRunnerLabels := make(container.Set[string]) + for _, r := range runners { + allRunnerLabels.AddMultiple(r.AgentLabels...) } - for _, id := range ids { - found := false + for _, w := range workflows { + w.ErrMsg = "" - for _, wf := range workflows { - if wf.Name == id { - found = true - break + for _, b := range w.Branchs { + if len(b.ErrMsg) != 0 { + w.ErrMsg += ctx.Locale.Tr("actions.runs.invalid_workflow_helper_branch", b.Branch, b.ErrMsg) + "; " } - } - if found { - continue + for _, l := range b.Labels { + if !allRunnerLabels.Contains(l) { + w.ErrMsg += ctx.Locale.Tr("actions.runs.no_matching_runner_helper", b.Branch, l) + "; " + break + } + } } - - workflows = append(workflows, Workflow{Name: id}) } ctx.Data["workflows"] = workflows diff --git a/services/repository/delete.go b/services/repository/delete.go index 08d6800ee7660..9ad135eb09034 100644 --- a/services/repository/delete.go +++ b/services/repository/delete.go @@ -162,6 +162,7 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID &actions_model.ActionScheduleSpec{RepoID: repoID}, &actions_model.ActionSchedule{RepoID: repoID}, &actions_model.ActionArtifact{RepoID: repoID}, + &actions_model.ActionWorkflow{RepoID: repoID}, ); err != nil { return fmt.Errorf("deleteBeans: %w", err) } diff --git a/services/repository/push.go b/services/repository/push.go index 391c8ad4ca7f1..c477b1d0bcf3b 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -14,6 +14,7 @@ import ( 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/modules/actions" "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" @@ -269,6 +270,12 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { if err := CacheRef(graceful.GetManager().HammerContext(), repo, gitRepo, opts.RefFullName); err != nil { log.Error("repo_module.CacheRef %s/%s failed: %v", repo.ID, branch, err) } + + err = actions.UpdateWorkflowBranchLabelsForBranch(ctx, gitRepo, repo, branch) + if err != nil { + return err + } + } else { notify_service.DeleteRef(ctx, pusher, repo, opts.RefFullName) if err = pull_service.CloseBranchPulls(ctx, pusher, repo.ID, branch); err != nil { @@ -279,6 +286,11 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error { if err := git_model.AddDeletedBranch(ctx, repo.ID, branch, pusher.ID); err != nil { return fmt.Errorf("AddDeletedBranch %s:%s failed: %v", repo.FullName(), branch, err) } + + err = actions.DeleteWorkflowBranchLabelsForBranch(ctx, gitRepo, repo, opts.OldCommitID, branch) + if err != nil { + return err + } } // Even if user delete a branch on a repository which he didn't watch, he will be watch that. From c56c37e67229e5e60d5ad613b74ee0ce03db9d2b Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Wed, 6 Dec 2023 14:59:10 +0000 Subject: [PATCH 4/5] Revert "show workflow names on other branchs also" This reverts commit 028102ff4771b5ae6c88b14ccbd446630a9a7274. --- models/actions/main_test.go | 1 - models/actions/run.go | 12 ------------ models/actions/run_test.go | 22 ---------------------- routers/web/repo/actions/actions.go | 2 -- templates/repo/actions/list.tmpl | 4 ++-- 5 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 models/actions/run_test.go diff --git a/models/actions/main_test.go b/models/actions/main_test.go index 0730c283a8bba..5d5089e3bba88 100644 --- a/models/actions/main_test.go +++ b/models/actions/main_test.go @@ -13,7 +13,6 @@ func TestMain(m *testing.M) { unittest.MainTest(m, &unittest.TestOptions{ FixtureFiles: []string{ "action_runner_token.yml", - "action_run.yml", }, }) } diff --git a/models/actions/run.go b/models/actions/run.go index 05afa1adfccde..a036775b962d0 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -133,18 +133,6 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) { return nil, fmt.Errorf("event %s is not a push event", run.Event) } -func FindWorkflowIDsByRepoID(ctx context.Context, repoID int64) ([]string, error) { - ids := make([]string, 0, 10) - - err := db.GetEngine(ctx).Table(new(ActionRun)).Where("repo_id = ?", repoID). - Select("workflow_id").Distinct("workflow_id").Find(&ids) - if err != nil { - return nil, err - } - - return ids, nil -} - func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) { if run.Event == webhook_module.HookEventPullRequest || run.Event == webhook_module.HookEventPullRequestSync { var payload api.PullRequestPayload diff --git a/models/actions/run_test.go b/models/actions/run_test.go deleted file mode 100644 index 98274f6e7e310..0000000000000 --- a/models/actions/run_test.go +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package actions - -import ( - "testing" - - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - - "github.com/stretchr/testify/assert" -) - -func TestFindWorkflowIDsByRepoID(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - ids, err := FindWorkflowIDsByRepoID(db.DefaultContext, 4) - assert.NoError(t, err) - - assert.EqualValues(t, []string{"artifact.yaml"}, ids) -} diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index daa7dbd91445a..9c8cea027a7d2 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -27,7 +27,6 @@ const ( type Workflow struct { Entry git.TreeEntry ErrMsg string - Name string } // MustEnableActions check if actions are enabled in settings @@ -90,7 +89,6 @@ func List(ctx *context.Context) { } } } - ctx.Data["workflows"] = workflows ctx.Data["RepoLink"] = ctx.Repo.Repository.Link() diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index ad43bc6836fb9..62d30305b3603 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -10,14 +10,14 @@
{{ctx.Locale.Tr "actions.runs.all_workflows"}} {{range .workflows}} - {{.Name}} + {{.Entry.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} {{end}} - {{if $.ActionsConfig.IsWorkflowDisabled .Name}} + {{if $.ActionsConfig.IsWorkflowDisabled .Entry.Name}}
{{ctx.Locale.Tr "disabled"}}
{{end}} From 69641b914f05d5d490a9f70b1c08c235cb8ecc5f Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Wed, 6 Dec 2023 15:04:48 +0000 Subject: [PATCH 5/5] ui Signed-off-by: a1012112796 <1012112796@qq.com> --- templates/repo/actions/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 62d30305b3603..ad43bc6836fb9 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -10,14 +10,14 @@
{{ctx.Locale.Tr "actions.runs.all_workflows"}} {{range .workflows}} - {{.Entry.Name}} + {{.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} {{end}} - {{if $.ActionsConfig.IsWorkflowDisabled .Entry.Name}} + {{if $.ActionsConfig.IsWorkflowDisabled .Name}}
{{ctx.Locale.Tr "disabled"}}
{{end}}