From 1d230af90d7c3db2357ddbdf66281e102791b728 Mon Sep 17 00:00:00 2001 From: Pete Davison Date: Fri, 15 Sep 2023 14:56:22 +0000 Subject: [PATCH] fix: advanced import resolving dynamic variables incorrectly --- taskfile/ast/graph.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/taskfile/ast/graph.go b/taskfile/ast/graph.go index 7d69d8cc..60c3a55c 100644 --- a/taskfile/ast/graph.go +++ b/taskfile/ast/graph.go @@ -89,16 +89,16 @@ func (tfg *TaskfileGraph) Merge() (*Taskfile, error) { // Handle advanced imports // i.e. where additional data is given when a Taskfile is included if include.AdvancedImport { - predecessorVertex.Taskfile.Vars.Range(func(k string, v Var) error { + vertex.Taskfile.Vars.Range(func(k string, v Var) error { o := v o.Dir = include.Dir - predecessorVertex.Taskfile.Vars.Set(k, o) + vertex.Taskfile.Vars.Set(k, o) return nil }) - predecessorVertex.Taskfile.Env.Range(func(k string, v Var) error { + vertex.Taskfile.Env.Range(func(k string, v Var) error { o := v o.Dir = include.Dir - predecessorVertex.Taskfile.Env.Set(k, o) + vertex.Taskfile.Env.Set(k, o) return nil }) for _, task := range vertex.Taskfile.Tasks.Values() {