fix: rewrite how image env is merged (#828)

* fix: rewrite how image env is merged * test: add test for extractFromImageEnv
2021-09-27 19:01:14 +00:00
parent 7a426a0f37
commit 6c60af7677
5 changed files with 84 additions and 63 deletions
--- a/pkg/runner/step_context.go
+++ b/pkg/runner/step_context.go
@@ -163,7 +163,11 @@ func (sc *StepContext) setupEnv(ctx context.Context) (ExpressionEvaluator, error
 	rc := sc.RunContext
 	sc.Env = sc.mergeEnv()
 	if sc.Env != nil {
-		err := rc.JobContainer.UpdateFromEnv(sc.Env["GITHUB_ENV"], &sc.Env)(ctx)
+		err := rc.JobContainer.UpdateFromImageEnv(&sc.Env)(ctx)
+		if err != nil {
+			return nil, err
+		}
+		err = rc.JobContainer.UpdateFromEnv(sc.Env["GITHUB_ENV"], &sc.Env)(ctx)
 		if err != nil {
 			return nil, err
 		}