ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-03-23 15:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix: rewrite how image env is merged

* test: add test for extractFromImageEnv
This commit is contained in:
Ryan
2021-09-27 19:01:14 +00:00
committed by GitHub
parent 7a426a0f37
commit 6c60af7677
5 changed files with 84 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/runner/step_context.go
View File

@@ -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
}