yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change handling of ExtraPath (#406)

Browse source 
To make the handling of ExtraPath portable append it to the front of the
PATH when it exists, instead of always changing the script.
This commit is contained in:
Wink Saville 2020-11-02 13:56:20 -08:00 committed by GitHub
parent 92067eb1a5
commit 8204ef4b82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/runner/step_context.go
View file

@ -92,6 +92,11 @@ func (sc *StepContext) setupEnv() common.Executor {
env = mergeMaps(rc.GetEnv(), step.GetEnv()) env = mergeMaps(rc.GetEnv(), step.GetEnv())
} }
if (rc.ExtraPath != nil) && (len(rc.ExtraPath) > 0) {
s := append(rc.ExtraPath, os.Getenv("PATH"))
env["PATH"] = strings.Join(s, string(os.PathSeparator))
}
for k, v := range env { for k, v := range env {
env[k] = rc.ExprEval.Interpolate(v) env[k] = rc.ExprEval.Interpolate(v)
} }
@ -106,11 +111,7 @@ func (sc *StepContext) setupShellCommand() common.Executor {
step := sc.Step step := sc.Step
return func(ctx context.Context) error { return func(ctx context.Context) error {
var script strings.Builder var script strings.Builder
var err error
_, err := script.WriteString(fmt.Sprintf("PATH=\"%s:${PATH}\"\n", strings.Join(rc.ExtraPath, ":")))
if err != nil {
return err
}
if step.WorkingDirectory == "" { if step.WorkingDirectory == "" {
step.WorkingDirectory = rc.Run.Job().Defaults.Run.WorkingDirectory step.WorkingDirectory = rc.Run.Job().Defaults.Run.WorkingDirectory