diff --git a/docs/usage.md b/docs/usage.md index c43c5073..e70cbc5a 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -346,7 +346,7 @@ the tasks are not up-to-date. If you need a certain set of conditions to be _true_ you can use the `preconditions` stanza. `preconditions` are very similar to `status` -lines except they support `sh` expansion and they SHOULD all return 0 +lines except they support `sh` expansion and they SHOULD all return 0. ```yaml version: '2' @@ -373,7 +373,7 @@ executed with a failing precondition will not run unless `--force` is given. Unlike `status` which will skip a task if it is up to date, and continue -executing tasks that depenend on it a `precondition` will fail a task, along +executing tasks that depend on it, a `precondition` will fail a task, along with any other tasks that depend on it. ```yaml @@ -384,13 +384,13 @@ tasks: - sh: "exit 1" task_will_also_fail: - deps: - - task_will_fail + deps: + - task_will_fail task_will_still_fail: - cmds: - - task: task_will_fail - - echo "I will not run" + cmds: + - task: task_will_fail + - echo "I will not run" ``` ## Variables diff --git a/internal/taskfile/precondition.go b/internal/taskfile/precondition.go index 554cdf12..04c1e532 100644 --- a/internal/taskfile/precondition.go +++ b/internal/taskfile/precondition.go @@ -7,7 +7,7 @@ import ( var ( // ErrCantUnmarshalPrecondition is returned for invalid precond YAML. - ErrCantUnmarshalPrecondition = errors.New("task: can't unmarshal precondition value") + ErrCantUnmarshalPrecondition = errors.New("task: Can't unmarshal precondition value") ) // Precondition represents a precondition necessary for a task to run diff --git a/precondition.go b/precondition.go index 115c19dd..3f2f066b 100644 --- a/precondition.go +++ b/precondition.go @@ -1,4 +1,3 @@ -// Package task provides ... package task import ( @@ -23,7 +22,7 @@ func (e *Executor) areTaskPreconditionsMet(ctx context.Context, t *taskfile.Task }) if err != nil { - e.Logger.Outf(p.Msg) + e.Logger.Outf("task: %s", p.Msg) return false, ErrPreconditionFailed } } diff --git a/task.go b/task.go index 608622f8..154166aa 100644 --- a/task.go +++ b/task.go @@ -233,7 +233,6 @@ func (e *Executor) runDeps(ctx context.Context, t *taskfile.Task) error { g.Go(func() error { err := e.RunTask(ctx, taskfile.Call{Task: d.Task, Vars: d.Vars}) if err != nil { - e.Logger.Errf("%s", err) return err } return nil @@ -250,7 +249,6 @@ func (e *Executor) runCommand(ctx context.Context, t *taskfile.Task, call taskfi case cmd.Task != "": err := e.RunTask(ctx, taskfile.Call{Task: cmd.Task, Vars: cmd.Vars}) if err != nil { - e.Logger.Errf("%s", err) return err } return nil diff --git a/task_test.go b/task_test.go index 05290fd5..79568abd 100644 --- a/task_test.go +++ b/task_test.go @@ -281,7 +281,6 @@ func TestPrecondition(t *testing.T) { Dir: dir, Stdout: &buff, Stderr: &buff, - Silent: false, } // A precondition that has been met