rayan/go-task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2026-07-07 14:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements + CHANGELOG for #677

Browse Source
This commit is contained in:
Andrey Nering
2022-03-19 18:41:03 -03:00
parent 78a57fdb4b
commit de09843467
8 changed files with 105 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
taskfile/read/taskfile.go
View File

@@ -110,15 +110,11 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
}
for _, task := range includedTaskfile.Tasks {
if includedTask.Vars != nil {
if task.Vars == nil {
task.Vars = &taskfile.Vars{}
}
task.Vars.Merge(includedTask.Vars)
}
if !filepath.IsAbs(task.Dir) {
task.Dir = filepath.Join(includedTask.Dir, task.Dir)
}
task.IncludeVars = includedTask.Vars
task.IncludedTaskfileVars = includedTaskfile.Vars
}
}