oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-06 17:40:58 +00:00
Code Wiki Activity

Format sources with gofmt (#472)

Browse source 
Co-authored-by: Casey Lee <cplee@nektos.com>
This commit is contained in:
KADOTA, Kyohei 2021-01-15 14:37:38 +09:00 • committed by GitHub
parent 7987e67c0a
commit 035108c9f1
6 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
act/container/docker_run.go
View file

@ -11,8 +11,8 @@ import (
"os"
"path/filepath"
"regexp"
"strings"
"runtime"
"strings"
"github.com/go-git/go-billy/v5/helper/polyfill"
"github.com/go-git/go-billy/v5/osfs"

2
act/runner/run_context.go
View file

@ -206,7 +206,7 @@ func (rc *RunContext) newStepExecutor(step *model.Step) common.Executor {
if err != nil {
return err
}
rc.ExprEval = exprEval;
rc.ExprEval = exprEval
runStep, err := rc.EvalBool(sc.Step.If)
if err != nil {

3
act/runner/step_context.go
View file

@ -101,14 +101,12 @@ func (sc *StepContext) mergeEnv() map[string]string {
return env
}
func (sc *StepContext) interpolateEnv(exprEval ExpressionEvaluator) {
for k, v := range sc.Env {
sc.Env[k] = exprEval.Interpolate(v)
}
}
func (sc *StepContext) setupEnv(ctx context.Context) (ExpressionEvaluator, error) {
rc := sc.RunContext
sc.Env = sc.mergeEnv()
@ -125,7 +123,6 @@ func (sc *StepContext) setupEnv(ctx context.Context) (ExpressionEvaluator, error
return evaluator, nil
}
func (sc *StepContext) setupShellCommand() common.Executor {
rc := sc.RunContext
step := sc.Step