codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 41692c314d
commit e6fcfed458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/container/docker_run.go
View File

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

2
pkg/runner/run_context.go
View File

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

3
pkg/runner/step_context.go
View File

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