Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1798,6 +1798,29 @@ VAR_2 is included-default-var2
assert.Equal(t, strings.TrimSpace(buff.String()), expectedOutputOrder)
}

func TestIncludedVarsMultiLevel(t *testing.T) {
const dir = "testdata/include_with_vars_multi_level"
var buff bytes.Buffer
e := task.Executor{
Dir: dir,
Stdout: &buff,
Stderr: &buff,
}
require.NoError(t, e.Setup())

expectedOutputOrder := strings.TrimSpace(`
task: [lib:greet] echo 'Hello world'
Hello world
task: [foo:lib:greet] echo 'Hello foo'
Hello foo
task: [bar:lib:greet] echo 'Hello bar'
Hello bar
`)
require.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "default"}))
t.Log(buff.String())
assert.Equal(t, strings.TrimSpace(buff.String()), expectedOutputOrder)
}

func TestErrorCode(t *testing.T) {
const dir = "testdata/error_code"

Expand Down
5 changes: 4 additions & 1 deletion taskfile/read/taskfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ func Taskfile(readerNode *ReaderNode) (*taskfile.Taskfile, string, error) {

for _, task := range includedTaskfile.Tasks.Values() {
task.Dir = filepathext.SmartJoin(dir, task.Dir)
task.IncludeVars = includedTask.Vars
if task.IncludeVars == nil {
task.IncludeVars = &taskfile.Vars{}
}
task.IncludeVars.Merge(includedTask.Vars)
task.IncludedTaskfileVars = includedTaskfile.Vars
task.IncludedTaskfile = &includedTask
}
Expand Down
17 changes: 17 additions & 0 deletions testdata/include_with_vars_multi_level/Taskfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: "3"

includes:
lib:
taskfile: lib/Taskfile.yml
internal: true
foo:
taskfile: foo/Taskfile.yml
bar:
taskfile: bar/Taskfile.yml

tasks:
default:
cmds:
- task: lib:greet
- task: foo:lib:greet
- task: bar:lib:greet
7 changes: 7 additions & 0 deletions testdata/include_with_vars_multi_level/bar/Taskfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: "3"

includes:
lib:
taskfile: ../lib/Taskfile.yml
vars:
RECEIVER: "bar"
7 changes: 7 additions & 0 deletions testdata/include_with_vars_multi_level/foo/Taskfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: "3"

includes:
lib:
taskfile: ../lib/Taskfile.yml
vars:
RECEIVER: "foo"
9 changes: 9 additions & 0 deletions testdata/include_with_vars_multi_level/lib/Taskfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: "3"

vars:
RECEIVER: "world"

tasks:
greet:
cmds:
- echo 'Hello {{.RECEIVER}}'