go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-06-23 00:38:19 +02:00
Code Issues Releases Activity

refactor: taskfile/ast package (#1450)

Browse Source 
* refactor: ast package

* feat: read -> taskfile

* refactor: taskfile.Taskfile -> taskfile.Read

* refactor: move merge function back into taskfile package

* refactor: rename taskfile.go to read.go
This commit is contained in:
Pete Davison
2023-12-29 20:32:03 +00:00
committed by GitHub
parent 2b67d05b9d
commit 247c2586c2
61 changed files with 471 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
setup.go
View File

@ -18,7 +18,7 @@ import (
"github.com/go-task/task/v3/internal/logger"
"github.com/go-task/task/v3/internal/output"
"github.com/go-task/task/v3/taskfile"
"github.com/go-task/task/v3/taskfile/read"
"github.com/go-task/task/v3/taskfile/ast"
)
func (e *Executor) Setup() error {
@ -69,7 +69,7 @@ func (e *Executor) setCurrentDir() error {
}
// Search for a taskfile
root, err := read.ExistsWalk(e.Dir)
root, err := taskfile.ExistsWalk(e.Dir)
if err != nil {
return err
}
@ -81,11 +81,11 @@ func (e *Executor) setCurrentDir() error {
func (e *Executor) readTaskfile() error {
uri := filepath.Join(e.Dir, e.Entrypoint)
node, err := read.NewNode(uri, e.Insecure)
node, err := taskfile.NewNode(uri, e.Insecure)
if err != nil {
return err
}
e.Taskfile, err = read.Taskfile(
e.Taskfile, err = taskfile.Read(
node,
e.Insecure,
e.Download,
@ -197,16 +197,16 @@ func (e *Executor) setupCompiler() error {
}
func (e *Executor) readDotEnvFiles() error {
if e.Taskfile.Version.LessThan(taskfile.V3) {
if e.Taskfile.Version.LessThan(ast.V3) {
return nil
}
env, err := read.Dotenv(e.Compiler, e.Taskfile, e.Dir)
env, err := taskfile.Dotenv(e.Compiler, e.Taskfile, e.Dir)
if err != nil {
return err
}
err = env.Range(func(key string, value taskfile.Var) error {
err = env.Range(func(key string, value ast.Var) error {
if ok := e.Taskfile.Env.Exists(key); !ok {
e.Taskfile.Env.Set(key, value)
}
@ -244,12 +244,12 @@ func (e *Executor) doVersionChecks() error {
v := &semver.Version{}
*v = *e.Taskfile.Version
if v.LessThan(taskfile.V3) {
if v.LessThan(ast.V3) {
return fmt.Errorf(`task: Taskfile schemas prior to v3 are no longer supported`)
}
// consider as equal to the greater version if round
if v.Equal(taskfile.V3) {
if v.Equal(ast.V3) {
v = semver.MustParse("3.8")
}