mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-19 15:06:34 +00:00
Add cli lint
option to treat warnings as errors (#4373)
Co-authored-by: Robert Kaussow <xoxys@rknet.org>
This commit is contained in:
parent
e6eb581104
commit
f4d7e9f0ff
4 changed files with 10 additions and 4 deletions
|
@ -40,6 +40,7 @@ steps:
|
||||||
- go run go.woodpecker-ci.org/woodpecker/v2/cmd/cli lint
|
- go run go.woodpecker-ci.org/woodpecker/v2/cmd/cli lint
|
||||||
environment:
|
environment:
|
||||||
WOODPECKER_DISABLE_UPDATE_CHECK: true
|
WOODPECKER_DISABLE_UPDATE_CHECK: true
|
||||||
|
WOODPECKER_LINT_STRICT: true
|
||||||
WOODPECKER_PLUGINS_PRIVILEGED: 'docker.io/woodpeckerci/plugin-docker-buildx:5.0.0'
|
WOODPECKER_PLUGINS_PRIVILEGED: 'docker.io/woodpeckerci/plugin-docker-buildx:5.0.0'
|
||||||
when:
|
when:
|
||||||
- event: pull_request
|
- event: pull_request
|
||||||
|
|
|
@ -220,7 +220,7 @@ func execWithAxis(ctx context.Context, c *cli.Command, file, repoPath string, ax
|
||||||
Workflow: conf,
|
Workflow: conf,
|
||||||
}})
|
}})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
str, err := lint.FormatLintError(file, err)
|
str, err := lint.FormatLintError(file, err, false)
|
||||||
fmt.Print(str)
|
fmt.Print(str)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -48,6 +48,11 @@ var Command = &cli.Command{
|
||||||
Usage: "Plugins which are trusted to handle the netrc info in clone steps",
|
Usage: "Plugins which are trusted to handle the netrc info in clone steps",
|
||||||
Value: constant.TrustedClonePlugins,
|
Value: constant.TrustedClonePlugins,
|
||||||
},
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Sources: cli.EnvVars("WOODPECKER_LINT_STRICT"),
|
||||||
|
Name: "strict",
|
||||||
|
Usage: "treat warnings as errors",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -119,7 +124,7 @@ func lintFile(_ context.Context, c *cli.Command, file string) error {
|
||||||
linter.WithTrustedClonePlugins(c.StringSlice("plugins-trusted-clone")),
|
linter.WithTrustedClonePlugins(c.StringSlice("plugins-trusted-clone")),
|
||||||
).Lint([]*linter.WorkflowConfig{config})
|
).Lint([]*linter.WorkflowConfig{config})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
str, err := FormatLintError(config.File, err)
|
str, err := FormatLintError(config.File, err, c.Bool("strict"))
|
||||||
|
|
||||||
if str != "" {
|
if str != "" {
|
||||||
fmt.Print(str)
|
fmt.Print(str)
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors"
|
pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
func FormatLintError(file string, err error) (string, error) {
|
func FormatLintError(file string, err error, strict bool) (string, error) {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ func FormatLintError(file string, err error) (string, error) {
|
||||||
for _, err := range linterErrors {
|
for _, err := range linterErrors {
|
||||||
line := " "
|
line := " "
|
||||||
|
|
||||||
if err.IsWarning {
|
if !strict && err.IsWarning {
|
||||||
line = fmt.Sprintf("%s ⚠️ ", line)
|
line = fmt.Sprintf("%s ⚠️ ", line)
|
||||||
amountWarnings++
|
amountWarnings++
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue