1
0
mirror of https://github.com/go-task/task.git synced 2025-03-17 21:08:01 +02:00

Adds --carry flag to enable carrying error codes from task cmds

This commit is contained in:
Bruno Delor 2022-06-02 14:22:00 +02:00
parent 5836cb1728
commit a790fb7afe
4 changed files with 22 additions and 5 deletions

View File

@ -68,6 +68,7 @@ func main() {
silent bool
dry bool
summary bool
carryErr bool
parallel bool
concurrency int
dir string
@ -89,6 +90,7 @@ func main() {
pflag.BoolVarP(&parallel, "parallel", "p", false, "executes tasks provided on command line in parallel")
pflag.BoolVar(&dry, "dry", false, "compiles and prints tasks in the order that they would be run, without executing them")
pflag.BoolVar(&summary, "summary", false, "show summary about a task")
pflag.BoolVar(&carryErr, "carry", false, "carry error code if any")
pflag.StringVarP(&dir, "dir", "d", "", "sets directory of execution")
pflag.StringVarP(&entrypoint, "taskfile", "t", "", `choose which Taskfile to run. Defaults to "Taskfile.yml"`)
pflag.StringVarP(&output.Name, "output", "o", "", "sets output style: [interleaved|group|prefixed]")
@ -216,7 +218,13 @@ func main() {
if err := e.Run(ctx, calls...); err != nil {
e.Logger.Errf(logger.Red, "%v", err)
os.Exit(1)
code := 1
if carryErr {
if tre, ok := err.(*task.TaskRunError); ok {
code = tre.ExitCode()
}
}
os.Exit(code)
}
}

View File

@ -3,6 +3,7 @@ package task
import (
"errors"
"fmt"
"mvdan.cc/sh/v3/interp"
)
var (
@ -18,15 +19,23 @@ func (err *taskNotFoundError) Error() string {
return fmt.Sprintf(`task: Task "%s" not found`, err.taskName)
}
type taskRunError struct {
type TaskRunError struct {
taskName string
err error
}
func (err *taskRunError) Error() string {
func (err *TaskRunError) Error() string {
return fmt.Sprintf(`task: Failed to run task "%s": %v`, err.taskName, err.err)
}
func (err *TaskRunError) ExitCode() int {
if c, ok := interp.IsExitStatus(err.err); ok {
return int(c)
}
return 1
}
// MaximumTaskCallExceededError is returned when a task is called too
// many times. In this case you probably have a cyclic dependendy or
// infinite loop

View File

@ -363,7 +363,7 @@ func (e *Executor) RunTask(ctx context.Context, call taskfile.Call) error {
continue
}
return &taskRunError{t.Task, err}
return &TaskRunError{t.Task, err}
}
}
e.Logger.VerboseErrf(logger.Magenta, `task: "%s" finished`, call.Task)

View File

@ -88,7 +88,7 @@ func (e *Executor) watchTasks(calls ...taskfile.Call) error {
}
func isContextError(err error) bool {
if taskRunErr, ok := err.(*taskRunError); ok {
if taskRunErr, ok := err.(*TaskRunError); ok {
err = taskRunErr.err
}