1
0
mirror of https://github.com/go-task/task.git synced 2025-11-25 22:32:55 +02:00

Revert "feat: process variables in include vars (#2113)"

This reverts commit f0414f162d.
This commit is contained in:
Pete Davison
2025-04-27 22:15:49 +00:00
parent 68d5095761
commit 8162b05f59
6 changed files with 26 additions and 16 deletions

View File

@@ -1964,10 +1964,6 @@ task: [included3:task1] echo "VAR_1 is included-default-var1"
VAR_1 is included-default-var1
task: [included3:task1] echo "VAR_2 is included-default-var2"
VAR_2 is included-default-var2
task: [included4:task1] echo "VAR_1 is included4-var1"
VAR_1 is included4-var1
task: [included4:task1] echo "VAR_2 is included-default-var2"
VAR_2 is included-default-var2
`)
require.NoError(t, e.Run(context.Background(), &task.Call{Task: "task1"}))
t.Log(buff.String())

View File

@@ -249,7 +249,7 @@ func (r *Reader) include(ctx context.Context, node Node) error {
Aliases: include.Aliases,
AdvancedImport: include.AdvancedImport,
Excludes: include.Excludes,
Vars: templater.ReplaceVars(include.Vars, cache),
Vars: include.Vars,
}
if err := cache.Err(); err != nil {
return err

View File

@@ -1,23 +1,16 @@
version: "3"
vars:
VAR_1: included4-var1
includes:
included1:
taskfile: include/Taskfile.include.yml
taskfile: include/Taskfile.include1.yml
vars:
VAR_1: included1-var1
included2:
taskfile: include/Taskfile.include.yml
taskfile: include/Taskfile.include2.yml
vars:
VAR_1: included2-var1
included3:
taskfile: include/Taskfile.include.yml
included4:
taskfile: include/Taskfile.include.yml
vars:
VAR_1: "{{.VAR_1}}"
taskfile: include/Taskfile.include3.yml
tasks:
task1:
@@ -25,4 +18,3 @@ tasks:
- task: included1:task1
- task: included2:task1
- task: included3:task1
- task: included4:task1

View File

@@ -0,0 +1,11 @@
version: "3"
vars:
VAR_1: '{{.VAR_1 | default "included-default-var1"}}'
VAR_2: '{{.VAR_2 | default "included-default-var2"}}'
tasks:
task1:
cmds:
- echo "VAR_1 is {{.VAR_1}}"
- echo "VAR_2 is {{.VAR_2}}"

View File

@@ -0,0 +1,11 @@
version: "3"
vars:
VAR_1: '{{.VAR_1 | default "included-default-var1"}}'
VAR_2: '{{.VAR_2 | default "included-default-var2"}}'
tasks:
task1:
cmds:
- echo "VAR_1 is {{.VAR_1}}"
- echo "VAR_2 is {{.VAR_2}}"