1
0
mirror of https://github.com/go-task/task.git synced 2025-11-29 22:48:03 +02:00

Merge branch 'master' into aliases

This commit is contained in:
Andrey Nering
2022-10-14 18:44:56 -03:00
14 changed files with 148 additions and 7 deletions

View File

@@ -7,8 +7,8 @@ import (
"github.com/go-task/task/v3/internal/execext"
"github.com/go-task/task/v3/internal/filepathext"
"golang.org/x/exp/slices"
"golang.org/x/exp/slices"
"gopkg.in/yaml.v3"
)

View File

@@ -18,6 +18,7 @@ type Taskfile struct {
Silent bool
Dotenv []string
Run string
Interval string
}
// UnmarshalYAML implements yaml.Unmarshaler interface
@@ -34,10 +35,13 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
Silent bool
Dotenv []string
Run string
Interval string
}
if err := unmarshal(&taskfile); err != nil {
return err
}
tf.Version = taskfile.Version
tf.Expansions = taskfile.Expansions
tf.Output = taskfile.Output
@@ -49,6 +53,8 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
tf.Silent = taskfile.Silent
tf.Dotenv = taskfile.Dotenv
tf.Run = taskfile.Run
tf.Interval = taskfile.Interval
if tf.Expansions <= 0 {
tf.Expansions = 2
}