go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-07-09 01:17:00 +02:00
Code Issues Releases Activity

v3: Fix bug where global vars were not being considered

Browse Source
This commit is contained in:
Andrey Nering
2020-04-05 11:08:49 -03:00
parent 6ed30f1add
commit cbb12b29bd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/taskfile/taskfile.go
View File

@ -41,5 +41,11 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
if tf.Expansions <= 0 { if tf.Expansions <= 0 {
tf.Expansions = 2 tf.Expansions = 2
} }
if tf.Vars == nil {
tf.Vars = &Vars{}
}
if tf.Env == nil {
tf.Env = &Vars{}
}
return nil return nil
} }

3
internal/taskfile/var.go
View File

@ -50,9 +50,6 @@ func (vs *Vars) Merge(other *Vars) {
// Set sets a value to a given key // Set sets a value to a given key
func (vs *Vars) Set(key string, value Var) { func (vs *Vars) Set(key string, value Var) {
if vs == nil {
vs = &Vars{}
}
if vs.Mapping == nil { if vs.Mapping == nil {
vs.Mapping = make(map[string]Var, 1) vs.Mapping = make(map[string]Var, 1)
} }