gitea/act
44
20
Fork 27
Code Issues 5 Pull Requests 5 Actions Releases 26 Activity

Patched options() to let container options propagate to job containers #80

Merged
wolfogre merged 2 commits from nicorac/act:main into main 2024-03-04 02:56:52 +00:00
Conversation 3 Commits 2 Files Changed 1 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/runner/run_context.go
View File

@ -717,7 +717,7 @@ func (rc *RunContext) options(ctx context.Context) string {
job := rc.Run.Job()
c := job.Container()
if c != nil {
return rc.ExprEval.Interpolate(ctx, c.Options)
return rc.Config.ContainerOptions + " " + rc.ExprEval.Interpolate(ctx, c.Options)
}
return rc.Config.ContainerOptions