Fix cli lint throwing error on warnings (#2995)

split out from #2771 --------- Co-authored-by: Anbraten <anton@ju60.de>
woodpecker-ci · Dec 22, 2023 · cd9d425 · cd9d425
1 parent f6ca346
commit cd9d425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cli/lint/lint.go b/cli/lint/lint.go
@@ -101,9 +101,9 @@ func lintFile(_ *cli.Context, file string) error {
 	// TODO: lint multiple files at once to allow checks for sth like "depends_on" to work
 	err = linter.New(linter.WithTrusted(true)).Lint([]*linter.WorkflowConfig{config})
 	if err != nil {
-		fmt.Printf("🔥 %s has errors:\n", output.String(config.File).Underline())
+		fmt.Printf("🔥 %s has warning / errors:\n", output.String(config.File).Underline())
 
-		hasErrors := true
+		hasErrors := false
 		for _, err := range pipeline_errors.GetPipelineErrors(err) {
 			line := "  "
 

diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go
@@ -318,10 +318,10 @@ func (e *docker) DestroyWorkflow(_ context.Context, conf *backend.Config, taskUU
 		for _, step := range stage.Steps {
 			containerName := toContainerName(step)
 			if err := e.client.ContainerKill(noContext, containerName, "9"); err != nil && !isErrContainerNotFoundOrNotRunning(err) {
-				log.Error().Err(err).Msgf("could not kill container '%s'", stage.Name)
+				log.Error().Err(err).Msgf("could not kill container '%s'", step.Name)
 			}
 			if err := e.client.ContainerRemove(noContext, containerName, removeOpts); err != nil && !isErrContainerNotFoundOrNotRunning(err) {
-				log.Error().Err(err).Msgf("could not remove container '%s'", stage.Name)
+				log.Error().Err(err).Msgf("could not remove container '%s'", step.Name)
 			}
 		}
 	}