grim/convey

Clean up some environment issues, namely with environments in plans

2019-08-02, Gary Kramlich
4c3bfd0e90ed
Parents e1fc04a51a0a
Children 556f474dec15
Clean up some environment issues, namely with environments in plans
2 files changed, 2 insertions(+), 3 deletions(-)
  • +1 -1
    plans/plans.go
  • +1 -2
    stages/stages.go
    • --- a/plans/plans.go Fri Aug 02 00:12:27 2019 -0500
    +++ b/plans/plans.go Fri Aug 02 00:12:47 2019 -0500
    @@ -74,7 +74,7 @@
    // Execute runs the plan.
    func (p *Plan) Execute(path string, tasks map[string]tasks.Task, env *environment.Environment, rt *runtime.Runtime) error {
    - planEnv := env.Copy().Merge(rt.Environment)
    + planEnv := env.Copy().Merge(rt.Environment).MergeSlice(p.Environment)
    logger := logging.NewAdapter(path)
    --- a/stages/stages.go Fri Aug 02 00:12:27 2019 -0500
    +++ b/stages/stages.go Fri Aug 02 00:12:47 2019 -0500
    @@ -87,8 +87,7 @@
    // Execute runs the stage.
    func (s *Stage) Execute(path string, logger *log.Entry, taskMap map[string]tasks.Task, env *environment.Environment, rt *runtime.Runtime) error {
    - stageEnv := environment.New(env.Items()...)
    - stageEnv.MergeSlice(s.Environment)
    + stageEnv := env.Copy().MergeSlice(env.Items()).MergeSlice(s.Environment)
    if s.Concurrent && !rt.State.ForceSequential {
    taskRes := make(chan error)