From 95e200b3f0492eea23b114ffd20e8a5f96a0d550 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sun, 8 Mar 2026 16:55:01 -0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20Call=20ReplaceVars()=20to=20re?= =?UTF-8?q?solve=20Ref's=20for=20imported=20global=20vars.=20(#=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2cdd7d3e43c0f08f3ac0c968501dcd7d3dd8f09e. --- compiler.go | 3 --- executor_test.go | 4 ---- testdata/var_references/Taskfile.yml | 14 -------------- ...using_templating_resolver_and_global_var.golden | 3 --- 4 files changed, 24 deletions(-) delete mode 100644 testdata/var_references/testdata/TestReference-reference_using_templating_resolver_and_global_var.golden diff --git a/compiler.go b/compiler.go index c0679c2cbf..311fd58423 100644 --- a/compiler.go +++ b/compiler.go @@ -114,9 +114,6 @@ func (c *Compiler) getVariables(t *ast.Task, call *Call, evaluateShVars bool) (* return nil, err } } - // Resolve any outstanding 'Ref' values in global vars (esp. globals from imported Taskfiles). - c.TaskfileVars = templater.ReplaceVars(c.TaskfileVars, &templater.Cache{Vars: result}) - if t != nil { for k, v := range t.IncludeVars.All() { if err := rangeFunc(k, v); err != nil { diff --git a/executor_test.go b/executor_test.go index 05080b3474..6e3ff3e1ec 100644 --- a/executor_test.go +++ b/executor_test.go @@ -927,10 +927,6 @@ func TestReference(t *testing.T) { name: "reference using templating resolver and dynamic var", call: "ref-resolver-sh", }, - { - name: "reference using templating resolver and global var", - call: "ref-global", - }, } for _, test := range tests { diff --git a/testdata/var_references/Taskfile.yml b/testdata/var_references/Taskfile.yml index e6f9da4948..71621f2908 100644 --- a/testdata/var_references/Taskfile.yml +++ b/testdata/var_references/Taskfile.yml @@ -2,9 +2,6 @@ version: '3' vars: GLOBAL_VAR: [1, 2, 2, 2, 3, 3, 4, 5] - GLOBAL_FOO: - ref: .GLOBAL_BAR - GLOBAL_BAR: bar tasks: default: @@ -12,7 +9,6 @@ tasks: - task: ref-dep - task: ref-resolver - task: ref-resolver-sh - - task: ref-global ref-cmd: vars: @@ -76,13 +72,3 @@ tasks: {{- else}} and {{$child.name -}} {{- end -}} {{- end -}}" - - ref-global: - vars: - TASK_FUBAR: - ref: .GLOBAL_FOO - cmds: - - echo "GLOBAL_FOO={{.GLOBAL_FOO}}" - - echo "GLOBAL_BAR={{.GLOBAL_BAR}}" - - echo "TASK_FUBAR={{.TASK_FUBAR}}" - silent: true diff --git a/testdata/var_references/testdata/TestReference-reference_using_templating_resolver_and_global_var.golden b/testdata/var_references/testdata/TestReference-reference_using_templating_resolver_and_global_var.golden deleted file mode 100644 index 320ea634db..0000000000 --- a/testdata/var_references/testdata/TestReference-reference_using_templating_resolver_and_global_var.golden +++ /dev/null @@ -1,3 +0,0 @@ -GLOBAL_FOO=bar -GLOBAL_BAR=bar -TASK_FUBAR=bar