darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lint trusted vs untrusted plugins

Browse source
This commit is contained in:
Brad Rydzewski 2015-05-19 23:22:31 -07:00
parent 8c655d600d
commit 46989c05f0
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/drone-build/run.go
View file

@ -1,8 +1,6 @@
package main
import (
"encoding/base64"
"fmt"
"path/filepath"
common "github.com/drone/drone/pkg/types"
@ -47,7 +45,7 @@ func setup(c *Context) error {
// inject the matrix parameters into the yaml
injected := inject.Inject(string(c.Yaml), c.Build.Environment)
c.Conf, err = parser.ParseSingle(injected, opts)
c.Conf, err = parser.ParseSingle(injected, &opts)
if err != nil {
return err
}
@ -153,7 +151,7 @@ func runSteps(c *Context, steps map[string]*common.Step) (int, error) {
conf.Cmd = toCommand(c, step)
// append global environment variables
conf.Env = append(conf.Env, c.Env)
conf.Env = append(conf.Env, c.Env...)
info, err := run(c.client, conf, step.Pull)
if err != nil {