diff --git a/experiments/experiments.go b/experiments/experiments.go index 24bd16b1df..3e14d39a03 100644 --- a/experiments/experiments.go +++ b/experiments/experiments.go @@ -33,14 +33,12 @@ var xList []Experiment func Parse(dir string) { config, _ := taskrc.GetConfig(dir) - ParseWithConfig(dir, config) } func ParseWithConfig(dir string, config *ast.TaskRC) { // Read any .env files readDotEnv(dir) - // Initialize the experiments GentleForce = New("GENTLE_FORCE", config, 1) RemoteTaskfiles = New("REMOTE_TASKFILES", config, 1) diff --git a/taskrc/taskrc.go b/taskrc/taskrc.go index 2a8566c60b..bfa91093c5 100644 --- a/taskrc/taskrc.go +++ b/taskrc/taskrc.go @@ -59,11 +59,11 @@ func GetConfig(dir string) (*ast.TaskRC, error) { // Find all the nodes from the given directory up to the users home directory absDir, err := filepath.Abs(dir) if err != nil { - return nil, err + return config, err } entrypoints, err := fsext.SearchAll("", absDir, defaultTaskRCs) if err != nil { - return nil, err + return config, err } // Reverse the entrypoints since we want the child files to override parent ones