From 4774273c98f4ad02a703b5762c53d35e5ef4bc20 Mon Sep 17 00:00:00 2001 From: Pete Davison Date: Sun, 10 Mar 2024 19:09:27 +0000 Subject: [PATCH] fix: merge conflict --- variables.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variables.go b/variables.go index cf218870..38a296b3 100644 --- a/variables.go +++ b/variables.go @@ -205,8 +205,8 @@ func (e *Executor) compiledTask(call *ast.Call, evaluateShVars bool) (*ast.Task, extra["KEY"] = keys[i] } newDep := dep.DeepCopy() - newDep.Task = r.ReplaceWithExtra(dep.Task, extra) - newDep.Vars = r.ReplaceVarsWithExtra(dep.Vars, extra) + newDep.Task = templater.ReplaceWithExtra(dep.Task, cache, extra) + newDep.Vars = templater.ReplaceVarsWithExtra(dep.Vars, cache, extra) new.Deps = append(new.Deps, newDep) } continue