Skip to content

enhancement: check workflow on push #28375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions models/actions/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
176 changes: 176 additions & 0 deletions models/actions/workflow.go
Original file line number Diff line number Diff line change
@@ -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
}
46 changes: 46 additions & 0 deletions models/actions/workflow_test.go
Original file line number Diff line number Diff line change
@@ -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"})
}
66 changes: 66 additions & 0 deletions modules/actions/workflows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
3 changes: 2 additions & 1 deletion options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading