From 6a604b3002ad17a1c074c63ab814772e8ae257ff Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sun, 17 May 2020 15:34:32 -0300 Subject: [PATCH] v3: Taskvars is no more --- task.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/task.go b/task.go index b108ea06..f70f15b0 100644 --- a/task.go +++ b/task.go @@ -111,11 +111,19 @@ func (e *Executor) Setup() error { if err != nil { return err } - e.taskvars, err = read.Taskvars(e.Dir) + + v, err := e.parsedVersion() if err != nil { return err } + if v < 3.0 { + e.taskvars, err = read.Taskvars(e.Dir) + if err != nil { + return err + } + } + if e.Stdin == nil { e.Stdin = os.Stdin } @@ -132,11 +140,6 @@ func (e *Executor) Setup() error { Color: e.Color, } - v, err := e.parsedVersion() - if err != nil { - - } - if v < 2 { return fmt.Errorf(`task: Taskfile versions prior to v2 are not supported anymore`) }