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

feat: add internal to included files

Browse Source
This commit is contained in:
Pete Davison
2022-07-22 02:16:14 +00:00
parent 6f8f1f1409
commit 3507fa40f1
6 changed files with 72 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
taskfile/read/taskfile.go
View File

@@ -78,6 +78,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
Taskfile: tr.Replace(includedTask.Taskfile),
Dir: tr.Replace(includedTask.Dir),
Optional: includedTask.Optional,
Internal: includedTask.Internal,
AdvancedImport: includedTask.AdvancedImport,
Vars: includedTask.Vars,
BaseDir: includedTask.BaseDir,
@@ -147,7 +148,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
}
}
if err = taskfile.Merge(t, includedTaskfile, namespace); err != nil {
if err = taskfile.Merge(t, includedTaskfile, includedTask.Internal, namespace); err != nil {
return err
}
return nil
@@ -163,7 +164,7 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, error) {
if err != nil {
return nil, err
}
if err = taskfile.Merge(t, osTaskfile); err != nil {
if err = taskfile.Merge(t, osTaskfile, false); err != nil {
return nil, err
}
}