Skip to content

Commit 6bff6e3

Browse files
show workflow config error on file view also (#24267)
As title, follow #24124 ![image](https://user-images.githubusercontent.com/25342410/233763031-8c5ab4a1-a4db-4173-87f7-cef41860f1db.png) --------- Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent 136d749 commit 6bff6e3

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

modules/actions/workflows.go

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ func init() {
2929
}
3030
}
3131

32+
func IsWorkflow(path string) bool {
33+
if (!strings.HasSuffix(path, ".yaml")) && (!strings.HasSuffix(path, ".yml")) {
34+
return false
35+
}
36+
37+
return strings.HasPrefix(path, ".gitea/workflows") || strings.HasPrefix(path, ".github/workflows")
38+
}
39+
3240
func ListWorkflows(commit *git.Commit) (git.Entries, error) {
3341
tree, err := commit.SubTree(".gitea/workflows")
3442
if _, ok := err.(git.ErrNotExist); ok {

routers/web/repo/view.go

+12
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
repo_model "code.gitea.io/gitea/models/repo"
2525
unit_model "code.gitea.io/gitea/models/unit"
2626
user_model "code.gitea.io/gitea/models/user"
27+
"code.gitea.io/gitea/modules/actions"
2728
"code.gitea.io/gitea/modules/base"
2829
"code.gitea.io/gitea/modules/charset"
2930
"code.gitea.io/gitea/modules/container"
@@ -39,6 +40,8 @@ import (
3940
"code.gitea.io/gitea/modules/typesniffer"
4041
"code.gitea.io/gitea/modules/util"
4142
"code.gitea.io/gitea/routers/web/feed"
43+
44+
"github.com/nektos/act/pkg/model"
4245
)
4346

4447
const (
@@ -348,6 +351,15 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
348351
if issueConfigErr != nil {
349352
ctx.Data["FileError"] = strings.TrimSpace(issueConfigErr.Error())
350353
}
354+
} else if actions.IsWorkflow(ctx.Repo.TreePath) {
355+
content, err := actions.GetContentFromEntry(entry)
356+
if err != nil {
357+
log.Error("actions.GetContentFromEntry: %v", err)
358+
}
359+
_, workFlowErr := model.ReadWorkflow(bytes.NewReader(content))
360+
if workFlowErr != nil {
361+
ctx.Data["FileError"] = ctx.Locale.Tr("actions.runs.invalid_workflow_helper", workFlowErr.Error())
362+
}
351363
}
352364

353365
isDisplayingSource := ctx.FormString("display") == "source"

0 commit comments

Comments
 (0)