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

feat: support interpolation in <job>.container.options (#1958)

Browse source
This commit is contained in:
Elian Doran 2023-09-12 16:35:25 +03:00 • committed by GitHub
parent 8b8f57896d
commit 3b61c0cd55
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
act/runner/run_context.go
View file

@ -518,14 +518,14 @@ func (rc *RunContext) platformImage(ctx context.Context) string {
return rc.runsOnImage(ctx) return rc.runsOnImage(ctx)
} }
func (rc *RunContext) options(_ context.Context) string { func (rc *RunContext) options(ctx context.Context) string {
job := rc.Run.Job() job := rc.Run.Job()
c := job.Container() c := job.Container()
if c == nil { if c != nil {
return rc.Config.ContainerOptions return rc.ExprEval.Interpolate(ctx, c.Options)
} }
return c.Options return rc.Config.ContainerOptions
} }
func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) { func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) {