1
0
mirror of https://github.com/go-task/task.git synced 2025-07-15 01:35:00 +02:00

Merge branch 'master' into v3

This commit is contained in:
Andrey Nering
2019-12-07 22:04:16 -03:00
7 changed files with 24 additions and 5 deletions

View File

@ -10,6 +10,7 @@ type Taskfile struct {
Vars Vars
Env Vars
Tasks Tasks
Silent bool
}
// UnmarshalYAML implements yaml.Unmarshaler interface
@ -23,6 +24,7 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
Vars Vars
Env Vars
Tasks Tasks
Silent bool
}
if err := unmarshal(&taskfile); err != nil {
return err
@ -35,6 +37,7 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
tf.Vars = taskfile.Vars
tf.Env = taskfile.Env
tf.Tasks = taskfile.Tasks
tf.Silent = taskfile.Silent
if tf.Expansions <= 0 {
tf.Expansions = 2
}