From f4ac6a2b9d7ac1f11b51a7f3bcb9eab2a3a41ebd Mon Sep 17 00:00:00 2001 From: Valentin Maerten Date: Mon, 6 Oct 2025 21:25:52 +0200 Subject: [PATCH 1/5] fix: return taskrc config even if there is an error --- experiments/experiments.go | 4 ++-- internal/flags/flags.go | 6 +++++- taskrc/taskrc.go | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/experiments/experiments.go b/experiments/experiments.go index 24bd16b1df..f0f47fec70 100644 --- a/experiments/experiments.go +++ b/experiments/experiments.go @@ -33,14 +33,14 @@ var xList []Experiment func Parse(dir string) { config, _ := taskrc.GetConfig(dir) - + fmt.Printf("config : %#v\n", config) ParseWithConfig(dir, config) } func ParseWithConfig(dir string, config *ast.TaskRC) { // Read any .env files readDotEnv(dir) - + fmt.Printf("config : %#v\n", config) // Initialize the experiments GentleForce = New("GENTLE_FORCE", config, 1) RemoteTaskfiles = New("REMOTE_TASKFILES", config, 1) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 5787e17a6d..7e197210b6 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -2,11 +2,13 @@ package flags import ( "cmp" + "fmt" "log" "os" "path/filepath" "time" + "github.com/davecgh/go-spew/spew" "github.com/spf13/pflag" "github.com/go-task/task/v3" @@ -96,8 +98,10 @@ func init() { // Parse the experiments dir = cmp.Or(dir, filepath.Dir(entrypoint)) - + fmt.Printf("dir : %#v\n", dir) + spew.Dump(dir) config, _ := taskrc.GetConfig(dir) + fmt.Printf("config : %#v\n", config) experiments.ParseWithConfig(dir, config) // Parse the rest of the flags 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 From ade01765d65012c2dc707d62ab0ce427f2af73c7 Mon Sep 17 00:00:00 2001 From: Valentin Maerten Date: Fri, 10 Oct 2025 22:35:28 +0200 Subject: [PATCH 2/5] remove debug --- internal/flags/flags.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 7e197210b6..1f80c14110 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -98,10 +98,8 @@ func init() { // Parse the experiments dir = cmp.Or(dir, filepath.Dir(entrypoint)) - fmt.Printf("dir : %#v\n", dir) spew.Dump(dir) config, _ := taskrc.GetConfig(dir) - fmt.Printf("config : %#v\n", config) experiments.ParseWithConfig(dir, config) // Parse the rest of the flags From d72be267e93cb14aa3b9a9b853ad76ea5638fe02 Mon Sep 17 00:00:00 2001 From: Valentin Maerten Date: Fri, 10 Oct 2025 22:36:25 +0200 Subject: [PATCH 3/5] remove debug --- experiments/experiments.go | 2 -- internal/flags/flags.go | 1 - 2 files changed, 3 deletions(-) diff --git a/experiments/experiments.go b/experiments/experiments.go index f0f47fec70..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) - fmt.Printf("config : %#v\n", config) ParseWithConfig(dir, config) } func ParseWithConfig(dir string, config *ast.TaskRC) { // Read any .env files readDotEnv(dir) - fmt.Printf("config : %#v\n", config) // Initialize the experiments GentleForce = New("GENTLE_FORCE", config, 1) RemoteTaskfiles = New("REMOTE_TASKFILES", config, 1) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 1f80c14110..a4d9f7b86f 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -98,7 +98,6 @@ func init() { // Parse the experiments dir = cmp.Or(dir, filepath.Dir(entrypoint)) - spew.Dump(dir) config, _ := taskrc.GetConfig(dir) experiments.ParseWithConfig(dir, config) From e4a9e2a273db6cf36ba2dc805a8500b0b3ea24f6 Mon Sep 17 00:00:00 2001 From: Valentin Maerten Date: Fri, 10 Oct 2025 22:37:14 +0200 Subject: [PATCH 4/5] remove debug --- internal/flags/flags.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index a4d9f7b86f..1132e2462c 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -2,13 +2,11 @@ package flags import ( "cmp" - "fmt" "log" "os" "path/filepath" "time" - "github.com/davecgh/go-spew/spew" "github.com/spf13/pflag" "github.com/go-task/task/v3" @@ -99,6 +97,7 @@ func init() { // Parse the experiments dir = cmp.Or(dir, filepath.Dir(entrypoint)) config, _ := taskrc.GetConfig(dir) + experiments.ParseWithConfig(dir, config) // Parse the rest of the flags From 04ae32293d97561de8aae886d6a59c81506db80b Mon Sep 17 00:00:00 2001 From: Valentin Maerten Date: Fri, 10 Oct 2025 22:38:12 +0200 Subject: [PATCH 5/5] remove debug --- internal/flags/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 1132e2462c..5787e17a6d 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -96,8 +96,8 @@ func init() { // Parse the experiments dir = cmp.Or(dir, filepath.Dir(entrypoint)) + config, _ := taskrc.GetConfig(dir) - experiments.ParseWithConfig(dir, config) // Parse the rest of the flags