codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'nektos/v0.2.46'

Browse Source
This commit is contained in:
Jason Song
2023-06-16 10:57:31 +08:00
parent a94498b482 b0d0cec71f
commit 8c56bd3aa5
13 changed files with 235 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/runner/run_context.go
View File

@@ -549,8 +549,9 @@ func (rc *RunContext) startContainer() common.Executor {
}
func (rc *RunContext) IsHostEnv(ctx context.Context) bool {
image := rc.platformImage(ctx)
return strings.EqualFold(image, "-self-hosted")
platform := rc.runsOnImage(ctx)
image := rc.containerImage(ctx)
return image == "" && strings.EqualFold(platform, "-self-hosted")
}
func (rc *RunContext) stopContainer() common.Executor {
@@ -603,7 +604,7 @@ func (rc *RunContext) Executor() common.Executor {
}
}
func (rc *RunContext) platformImage(ctx context.Context) string {
func (rc *RunContext) containerImage(ctx context.Context) string {
job := rc.Run.Job()
c := job.Container()
@@ -611,6 +612,12 @@ func (rc *RunContext) platformImage(ctx context.Context) string {
return rc.ExprEval.Interpolate(ctx, c.Image)
}
return ""
}
func (rc *RunContext) runsOnImage(ctx context.Context) string {
job := rc.Run.Job()
if job.RunsOn() == nil {
common.Logger(ctx).Errorf("'runs-on' key not defined in %s", rc.String())
}
@@ -636,6 +643,14 @@ func (rc *RunContext) platformImage(ctx context.Context) string {
return ""
}
func (rc *RunContext) platformImage(ctx context.Context) string {
if containerImage := rc.containerImage(ctx); containerImage != "" {
return containerImage
}
return rc.runsOnImage(ctx)
}
func (rc *RunContext) options(ctx context.Context) string {
job := rc.Run.Job()
c := job.Container()