oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code 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 df05a7364e
commit bd8f62b024
5 changed files with 84 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
act/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
}