fix: include dir

go-task · Jul 5, 2024 · d90b650 · d90b650
1 parent 23542f1
commit d90b650
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/taskfile/ast/tasks.go b/taskfile/ast/tasks.go
@@ -2,7 +2,6 @@ package ast
 
 import (
  "fmt"
- "path"
  "strings"
 
  "gopkg.in/yaml.v3"
@@ -86,19 +85,18 @@ func (t1 *Tasks) Merge(t2 Tasks, include *Include, includedTaskfileVars *Vars) e
  }
  }
 
- if include.AdvancedImport {
- task.Dir = filepathext.SmartJoin(include.Dir, task.Dir)
- if task.IncludeVars == nil {
- task.IncludeVars = &Vars{}
- }
- task.IncludeVars.Merge(include.Vars, nil)
- task.IncludedTaskfileVars = includedTaskfileVars.DeepCopy()
- }
  taskName = taskNameWithNamespace(name, include.Namespace)
  task.Namespace = include.Namespace
  task.Task = taskName
- } else {
- task.Dir = path.Join(include.Dir, task.Dir)
+ }
+
+ if include.AdvancedImport {
+ task.Dir = filepathext.SmartJoin(include.Dir, task.Dir)
+ if task.IncludeVars == nil {
+ task.IncludeVars = &Vars{}
+ }
+ task.IncludeVars.Merge(include.Vars, nil)
+ task.IncludedTaskfileVars = includedTaskfileVars.DeepCopy()
  }
 
  if t1.Get(taskName) != nil {
@@ -153,7 +151,6 @@ func (t *Tasks) UnmarshalYAML(node *yaml.Node) error {
  }
  }
  }
- tasks.Set(name, task)
  return nil
  })
 

diff --git a/testdata/includes_flatten/Taskfile.yml b/testdata/includes_flatten/Taskfile.yml
@@ -3,6 +3,7 @@ version: '3'
 includes:
  included:
  taskfile: ./included
+ dir: ./included
  flatten: true
 
 tasks:

diff --git a/testdata/includes_flatten/included/Taskfile.yml b/testdata/includes_flatten/included/Taskfile.yml
@@ -15,3 +15,9 @@ tasks:
  - gen
  cmds:
  - echo "with_deps from included"
+
+
+ pwd:
+ desc: Print working directory
+ cmds:
+ - pwd