Skip to content

Commit f0414f1

Browse files
authored
feat: process variables in include vars (#2113)
* feat: process variables in include vars * feat: add test for include variables
1 parent a24f495 commit f0414f1

File tree

6 files changed

+16
-26
lines changed

6 files changed

+16
-26
lines changed

task_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,6 +1961,10 @@ task: [included3:task1] echo "VAR_1 is included-default-var1"
19611961
VAR_1 is included-default-var1
19621962
task: [included3:task1] echo "VAR_2 is included-default-var2"
19631963
VAR_2 is included-default-var2
1964+
task: [included4:task1] echo "VAR_1 is included4-var1"
1965+
VAR_1 is included4-var1
1966+
task: [included4:task1] echo "VAR_2 is included-default-var2"
1967+
VAR_2 is included-default-var2
19641968
`)
19651969
require.NoError(t, e.Run(context.Background(), &task.Call{Task: "task1"}))
19661970
t.Log(buff.String())

taskfile/reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func (r *Reader) include(node Node) error {
254254
Aliases: include.Aliases,
255255
AdvancedImport: include.AdvancedImport,
256256
Excludes: include.Excludes,
257-
Vars: include.Vars,
257+
Vars: templater.ReplaceVars(include.Vars, cache),
258258
}
259259
if err := cache.Err(); err != nil {
260260
return err
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
version: "3"
22

3+
vars:
4+
VAR_1: included4-var1
5+
36
includes:
47
included1:
5-
taskfile: include/Taskfile.include1.yml
8+
taskfile: include/Taskfile.include.yml
69
vars:
710
VAR_1: included1-var1
811
included2:
9-
taskfile: include/Taskfile.include2.yml
12+
taskfile: include/Taskfile.include.yml
1013
vars:
1114
VAR_1: included2-var1
1215
included3:
13-
taskfile: include/Taskfile.include3.yml
16+
taskfile: include/Taskfile.include.yml
17+
included4:
18+
taskfile: include/Taskfile.include.yml
19+
vars:
20+
VAR_1: "{{.VAR_1}}"
1421

1522
tasks:
1623
task1:
1724
cmds:
1825
- task: included1:task1
1926
- task: included2:task1
2027
- task: included3:task1
28+
- task: included4:task1

testdata/include_with_vars/include/Taskfile.include2.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

testdata/include_with_vars/include/Taskfile.include3.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)