go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-11-23 22:24:45 +02:00
Code Issues Releases Activity

func isUpToDate should be bound to Task struct

Browse Source
This commit is contained in:
Andrey Nering
2017-07-30 19:45:01 -03:00
parent 70ef9fbcfe
commit f54dde4f78
3 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
task.go
View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
"os"
"path/filepath"
"strings"
"sync"
"sync/atomic"
@@ -124,7 +123,7 @@ func (e *Executor) RunTask(ctx context.Context, call Call) error {
return err
}
t, err := origTask.CompiledTask(vars)
t, err := origTask.CompiledTask(e.Dir, vars)
if err != nil {
return err
}
@@ -140,13 +139,13 @@ func (e *Executor) RunTask(ctx context.Context, call Call) error {
if err != nil {
return err
}
t, err = origTask.CompiledTask(vars)
t, err = origTask.CompiledTask(e.Dir, vars)
if err != nil {
return err
}
if !e.Force {
upToDate, err := e.isTaskUpToDate(ctx, t)
upToDate, err := t.isUpToDate(ctx)
if err != nil {
return err
}
@@ -188,8 +187,8 @@ func (e *Executor) runCommand(ctx context.Context, t *Task, call Call, i int) er
opts := &execext.RunCommandOptions{
Context: ctx,
Command: cmd.Cmd,
Dir: e.getTaskDir(t),
Env: e.getEnviron(t),
Dir: t.Dir,
Env: t.getEnviron(),
Stdin: e.Stdin,
Stderr: e.Stderr,
}
@@ -210,14 +209,7 @@ func (e *Executor) runCommand(ctx context.Context, t *Task, call Call, i int) er
return execext.RunCommand(opts)
}
func (e *Executor) getTaskDir(t *Task) string {
if filepath.IsAbs(t.Dir) {
return t.Dir
}
return filepath.Join(e.Dir, t.Dir)
}
func (e *Executor) getEnviron(t *Task) []string {
func (t *Task) getEnviron() []string {
if t.Env == nil {
return nil
}