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

Removed automatic inclusion of Taskfiles by OS and update tests

Browse Source
This commit is contained in:
Evgeny Abramovich
2020-02-15 16:40:42 +03:00
parent a3464068bd
commit f38ba7fcd3
11 changed files with 10 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/taskfile/read/taskfile.go
View File

@@ -6,7 +6,6 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"github.com/go-task/task/v2/internal/taskfile"
@@ -46,21 +45,10 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
return nil, ErrIncludedTaskfilesCantHaveIncludes
}
includedTaskDirectory := filepath.Dir(path)
includedTaskfileName := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
path = filepath.Join(includedTaskDirectory, fmt.Sprintf("%s_%s.yml", includedTaskfileName, runtime.GOOS))
if _, err = os.Stat(path); err == nil {
osIncludedTaskfile, err := readTaskfile(path)
if err != nil {
return nil, err
}
if err = taskfile.Merge(includedTaskfile, osIncludedTaskfile); err != nil {
return nil, err
}
}
for _, task := range includedTaskfile.Tasks {
task.Dir = filepath.Join(includedTask.Dir, task.Dir)
if !filepath.IsAbs(task.Dir) {
task.Dir = filepath.Join(includedTask.Dir, task.Dir)
}
}
if err = taskfile.Merge(t, includedTaskfile, namespace); err != nil {