Fix the flakiness.

Author: trulede

compiler.go

@@ -108,6 +108,18 @@ func (c *Compiler) getVariables(t *ast.Task, call *Call, evaluateShVars bool) (*
 			}
 		}
 
+		if !evaluateShVars {
+			// Add includedTaskfile.Vars, and replace/overwrite taskfile.Vars,
+			// _before_ calculating the t.Dir using the templater. Because
+			// evaluateShVars is not set, the dir used when creating rangeFunc
+			// will not be used (sh vars are evaluated on subsequent calls).
+			for k, v := range t.IncludedTaskfileVars.All() {
+				if err := rangeFunc(k, v); err != nil {
+					return nil, err
+				}
+			}
+		}
+
 		// Calculate the t.Dir now based on values saved during AST parsing
 		// and then get a Task RangeFunc.
 		dir := c.Dir