go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-01-18 04:59:01 +02:00
Code Issues Releases Activity

fix: experiment flags not working when .env is not in cwd (#1478)

Browse Source
This commit is contained in:
Pete Davison 2024-01-26 00:15:02 +00:00 committed by GitHub
parent d0efc1c5cd
commit e9392df30b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/experiments/experiments.go
View File

@ -4,10 +4,12 @@ import (
"fmt"
"io"
"os"
"path"
"strings"
"text/tabwriter"
"github.com/joho/godotenv"
"github.com/spf13/pflag"
"golang.org/x/exp/slices"
"github.com/go-task/task/v3/internal/logger"
@ -59,8 +61,28 @@ func getEnv(xName string) string {
return os.Getenv(envName)
}
func getEnvFilePath() string {
// Parse the CLI flags again to get the directory/taskfile being run
// We use a flagset here so that we can parse a subset of flags without exiting on error.
var dir, taskfile string
fs := pflag.NewFlagSet("experiments", pflag.ContinueOnError)
fs.StringVarP(&dir, "dir", "d", "", "Sets directory of execution.")
fs.StringVarP(&taskfile, "taskfile", "t", "", `Choose which Taskfile to run. Defaults to "Taskfile.yml".`)
_ = fs.Parse(os.Args[1:])
// If the directory is set, find a .env file in that directory.
if dir != "" {
return path.Join(dir, ".env")
}
// If the taskfile is set, find a .env file in the directory containing the Taskfile.
if taskfile != "" {
return path.Join(path.Dir(taskfile), ".env")
}
// Otherwise just use the current working directory.
return ".env"
}
func readDotEnv() {
env, _ := godotenv.Read()
env, _ := godotenv.Read(getEnvFilePath())
// If the env var is an experiment, set it.
for key, value := range env {
if strings.HasPrefix(key, envPrefix) {