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

feat: namespace aliases

Browse Source
This commit is contained in:
Pete Davison
2022-10-02 05:07:58 +00:00
parent 376a6182eb
commit bb79fa1dc3
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
taskfile/read/taskfile.go
View File

@@ -79,6 +79,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
Dir: tr.Replace(includedTask.Dir),
Optional: includedTask.Optional,
Internal: includedTask.Internal,
Aliases: includedTask.Aliases,
AdvancedImport: includedTask.AdvancedImport,
Vars: includedTask.Vars,
BaseDir: includedTask.BaseDir,
@@ -149,7 +150,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
}
}
if err = taskfile.Merge(t, includedTaskfile, includedTask.Internal, namespace); err != nil {
if err = taskfile.Merge(t, includedTaskfile, &includedTask, namespace); err != nil {
return err
}
return nil
@@ -165,7 +166,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
if err != nil {
return nil, err
}
if err = taskfile.Merge(t, osTaskfile, false); err != nil {
if err = taskfile.Merge(t, osTaskfile, nil); err != nil {
return nil, err
}
}