Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/tsk/tsk.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ func main() {
os.Exit(1)
}

exec.RunTasks(exec.Config, &opts.tasks)
if err := exec.RunTasks(exec.Config, &opts.tasks); err != nil {
fmt.Println(err)
os.Exit(1)
}
}

func parseArgs(args []string, dashIndex int) (tasks []string, cliArgs string) {
Expand Down
17 changes: 3 additions & 14 deletions internal/task/task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ func TestConfig_CompileEnv(t *testing.T) {
}

_, err := config.CompileEnv()
if err == nil {
t.Fatalf("expected error, got nil")
// we expect this to be non-fatal
if err != nil {
t.Fatalf("expected nil, got err: %v", err)
}
})
}
Expand Down Expand Up @@ -204,18 +205,6 @@ func TestTask_CompileEnv(t *testing.T) {
}
}
})

t.Run("error loading dotenv", func(t *testing.T) {
task := Task{
DotEnv: "nonexistent.env",
Dir: "/some/nonexistent/path",
}

_, err := task.CompileEnv([]string{})
if err == nil {
t.Fatalf("expected error, got nil")
}
})
}

func TestRunCmd(t *testing.T) {
Expand Down
4 changes: 3 additions & 1 deletion internal/task/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ func readDotEnv(filename string) (map[string]string, error) {
func appendDotEnvToEnv(env []string, dotenv string) ([]string, error) {
additionalEnv, err := readDotEnv(dotenv)
if err != nil {
return nil, err
// the dotenv file missing is non-fatal. log a warning and continue
fmt.Printf("Warning: Could not load dotenv file %s: %v\n", dotenv, err)
return env, nil
}
env = append(env, ConvertEnvToStringSlice(additionalEnv)...)
return env, nil
Expand Down