Skip to content

Commit db127b0

Browse files
authored
Merge pull request #20 from nxtcoder17/bug/absolute-dotenv-paths-on-global-dotenv
fix: fixes global dot-env paths, failing with absolute path errors
2 parents 8835533 + 61e6dc8 commit db127b0

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

examples/Runfile.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ includes:
1111
env:
1212
global_k1: "v1"
1313

14+
dotenv:
15+
- ../.secrets/env
16+
1417
tasks:
1518
cook:
1619
env:
@@ -25,16 +28,16 @@ tasks:
2528
# value: "this is default value"
2629
# sh: echo this should be the default value
2730
gotmpl: len "asdfadf"
28-
dotenv:
29-
- ../.secrets/env
31+
# dotenv:
32+
# - ../.secrets/env
3033
cmd:
3134
# - sleep 5
3235
# - echo "hi hello"
3336
# - echo "value of k1 is '$k1'"
3437
# - echo "value of k2 is '$k2'"
3538
# - echo "value of k3 is '$k3'"
36-
# - echo "value of key_id (from .dotenv) is '$key_id', ${#key_id}"
3739
- echo "hello from cook"
40+
- echo "value of key_id (from .dotenv) is '$key_id', ${#key_id}"
3841
- echo "k4 is $k4"
3942
- echo "k5 is $k5"
4043

pkg/runfile/task-parser.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ func ParseTask(ctx Context, rf *Runfile, task Task) (*ParsedTask, *Error) {
3737
}
3838

3939
if rf.DotEnv != nil {
40-
m, err := parseDotEnvFiles(rf.DotEnv...)
40+
dotEnvPaths, err := resolveDotEnvFiles(filepath.Dir(rf.attrs.RunfilePath), rf.DotEnv...)
41+
if err != nil {
42+
return nil, err
43+
}
44+
m, err := parseDotEnvFiles(dotEnvPaths...)
4145
if err != nil {
4246
return nil, err
4347
}

0 commit comments

Comments
 (0)