Skip to content

Commit 6a604b3

Browse files
committed
v3: Taskvars is no more
1 parent 5a435b5 commit 6a604b3

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

task.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,19 @@ func (e *Executor) Setup() error {
111111
if err != nil {
112112
return err
113113
}
114-
e.taskvars, err = read.Taskvars(e.Dir)
114+
115+
v, err := e.parsedVersion()
115116
if err != nil {
116117
return err
117118
}
118119

120+
if v < 3.0 {
121+
e.taskvars, err = read.Taskvars(e.Dir)
122+
if err != nil {
123+
return err
124+
}
125+
}
126+
119127
if e.Stdin == nil {
120128
e.Stdin = os.Stdin
121129
}
@@ -132,11 +140,6 @@ func (e *Executor) Setup() error {
132140
Color: e.Color,
133141
}
134142

135-
v, err := e.parsedVersion()
136-
if err != nil {
137-
138-
}
139-
140143
if v < 2 {
141144
return fmt.Errorf(`task: Taskfile versions prior to v2 are not supported anymore`)
142145
}

0 commit comments

Comments
 (0)