go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-11-29 22:48:03 +02:00
Code Issues Releases Activity

feat: don't send entire include to node resolvers

Browse Source
This commit is contained in:
Pete Davison
2024-02-13 19:28:42 +00:00
parent cbc19d35ea
commit 68191205c7
5 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
taskfile/node_file.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/go-task/task/v3/internal/execext"
"github.com/go-task/task/v3/internal/filepathext"
"github.com/go-task/task/v3/internal/logger"
"github.com/go-task/task/v3/taskfile/ast"
)
// A FileNode is a node that reads a taskfile from the local filesystem.
@@ -78,13 +77,13 @@ func resolveFileNodeEntrypointAndDir(l *logger.Logger, entrypoint, dir string) (
return entrypoint, dir, nil
}
func (node *FileNode) ResolveIncludeEntrypoint(include ast.Include) (string, error) {
func (node *FileNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
// If the file is remote, we don't need to resolve the path
if strings.Contains(include.Taskfile, "://") {
return include.Taskfile, nil
if strings.Contains(entrypoint, "://") {
return entrypoint, nil
}
path, err := execext.Expand(include.Taskfile)
path, err := execext.Expand(entrypoint)
if err != nil {
return "", err
}
@@ -99,8 +98,8 @@ func (node *FileNode) ResolveIncludeEntrypoint(include ast.Include) (string, err
return filepathext.SmartJoin(entrypointDir, path), nil
}
func (node *FileNode) ResolveIncludeDir(include ast.Include) (string, error) {
path, err := execext.Expand(include.Dir)
func (node *FileNode) ResolveIncludeDir(dir string) (string, error) {
path, err := execext.Expand(dir)
if err != nil {
return "", err
}