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

Merge branch 'internal-tasks' of https://github.com/pd93/task into pd93-internal-tasks

Browse Source
This commit is contained in:
Andrey Nering
2022-09-17 12:59:19 -03:00
parent 8f0893b5f7 11409ccf21
commit 4a5c1e9ec4
13 changed files with 190 additions and 7 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,
@@ -148,7 +149,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
@@ -164,7 +165,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
}
}