From 813c9a18d84b9c3b64a527e22ef47181c4982ab4 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Wed, 9 Aug 2023 20:41:12 +0800 Subject: [PATCH] refactor: remove unnecessary nil check in RunContext (#1955) From the Go docs: "For a nil slice, the number of iterations is 0" [1] Therefore, an additional nil check for `job.RunsOn()` before the loop is unnecessary because `job.RunsOn()` returns a `[]string`. [1]: https://go.dev/ref/spec#For_range Signed-off-by: Eng Zer Jun --- act/runner/run_context.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/act/runner/run_context.go b/act/runner/run_context.go index bcd36a8e..37f47671 100644 --- a/act/runner/run_context.go +++ b/act/runner/run_context.go @@ -789,17 +789,15 @@ func (rc *RunContext) withGithubEnv(ctx context.Context, github *model.GithubCon } job := rc.Run.Job() - if job.RunsOn() != nil { - for _, runnerLabel := range job.RunsOn() { - platformName := rc.ExprEval.Interpolate(ctx, runnerLabel) - if platformName != "" { - if platformName == "ubuntu-latest" { - // hardcode current ubuntu-latest since we have no way to check that 'on the fly' - env["ImageOS"] = "ubuntu20" - } else { - platformName = strings.SplitN(strings.Replace(platformName, `-`, ``, 1), `.`, 2)[0] - env["ImageOS"] = platformName - } + for _, runnerLabel := range job.RunsOn() { + platformName := rc.ExprEval.Interpolate(ctx, runnerLabel) + if platformName != "" { + if platformName == "ubuntu-latest" { + // hardcode current ubuntu-latest since we have no way to check that 'on the fly' + env["ImageOS"] = "ubuntu20" + } else { + platformName = strings.SplitN(strings.Replace(platformName, `-`, ``, 1), `.`, 2)[0] + env["ImageOS"] = platformName } } }