Only init targets when running a job scoped at the project or target
This commit is contained in:
parent
59144f74d3
commit
d49944a25d
@ -65,7 +65,6 @@ func (c *Client) Task(
|
||||
ctx context.Context,
|
||||
op *vagrant_server.Job_RunOp,
|
||||
mod JobModifier,
|
||||
|
||||
) (*vagrant_server.Job_RunResult, error) {
|
||||
if op == nil {
|
||||
op = &vagrant_server.Job_RunOp{}
|
||||
|
||||
@ -396,11 +396,6 @@ func (b *Basis) LoadProject(popts ...ProjectOption) (p *Project, err error) {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize any targets defined within the project
|
||||
if err = p.InitTargets(); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// If any targets are defined in the project, load them
|
||||
if len(p.project.Targets) > 0 {
|
||||
for _, tref := range p.project.Targets {
|
||||
|
||||
@ -282,6 +282,11 @@ func (p *Project) Run(ctx context.Context, task *vagrant_server.Task) (err error
|
||||
"project", p,
|
||||
"task", task)
|
||||
|
||||
// Intialize targets
|
||||
if err = p.InitTargets(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cmd, err := p.basis.component(
|
||||
ctx, component.CommandType, task.Component.Name)
|
||||
if err != nil {
|
||||
|
||||
@ -213,6 +213,11 @@ func (t *Target) Run(ctx context.Context, task *vagrant_server.Task) (err error)
|
||||
"target", t,
|
||||
"task", task)
|
||||
|
||||
// Intialize targets
|
||||
if err = t.project.InitTargets(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cmd, err := t.project.basis.component(
|
||||
ctx, component.CommandType, task.Component.Name)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user