go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-01-06 03:53:54 +02:00
Code Issues Releases Activity

add vars to included taskfiles

Browse Source
This commit is contained in:
Dan Ballweg 2022-02-23 16:53:46 -06:00
parent d8555e5a5d
commit 292cf75836
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taskfile/included_taskfile.go
View File

@ -12,6 +12,7 @@ type IncludedTaskfile struct {
Dir string Dir string
Optional bool Optional bool
AdvancedImport bool AdvancedImport bool
Vars *Vars
} }
// IncludedTaskfiles represents information about included tasksfiles // IncludedTaskfiles represents information about included tasksfiles
@ -94,6 +95,7 @@ func (it *IncludedTaskfile) UnmarshalYAML(unmarshal func(interface{}) error) err
Taskfile string Taskfile string
Dir string Dir string
Optional bool Optional bool
Vars *Vars
} }
if err := unmarshal(&includedTaskfile); err != nil { if err := unmarshal(&includedTaskfile); err != nil {
return err return err
@ -102,5 +104,6 @@ func (it *IncludedTaskfile) UnmarshalYAML(unmarshal func(interface{}) error) err
it.Dir = includedTaskfile.Dir it.Dir = includedTaskfile.Dir
it.Optional = includedTaskfile.Optional it.Optional = includedTaskfile.Optional
it.AdvancedImport = true it.AdvancedImport = true
it.Vars = includedTaskfile.Vars
return nil return nil
} }

7
taskfile/read/taskfile.go
View File

@ -62,6 +62,7 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
Dir: tr.Replace(includedTask.Dir), Dir: tr.Replace(includedTask.Dir),
Optional: includedTask.Optional, Optional: includedTask.Optional,
AdvancedImport: includedTask.AdvancedImport, AdvancedImport: includedTask.AdvancedImport,
Vars: includedTask.Vars,
} }
if err := tr.Err(); err != nil { if err := tr.Err(); err != nil {
return err return err
@ -109,6 +110,12 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
} }
for _, task := range includedTaskfile.Tasks { 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) { if !filepath.IsAbs(task.Dir) {
task.Dir = filepath.Join(includedTask.Dir, task.Dir) task.Dir = filepath.Join(includedTask.Dir, task.Dir)
} }