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

Merge remote-tracking branch 'origin'

Browse source
This commit is contained in:
Brad Rydzewski 2017-03-25 17:54:17 +08:00
commit a51dfa4208
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drone/build_logs.go
View file

@ -34,7 +34,7 @@ func buildLogs(c *cli.Context) error {
buildArg := c.Args().Get(1) buildArg := c.Args().Get(1)
var number int var number int
if buildArg == "last" { if buildArg == "" {
// Fetch the build number from the last build // Fetch the build number from the last build
build, err := client.BuildLast(owner, name, "") build, err := client.BuildLast(owner, name, "")
if err != nil { if err != nil {
@ -44,7 +44,7 @@ func buildLogs(c *cli.Context) error {
} else { } else {
number, err = strconv.Atoi(buildArg) number, err = strconv.Atoi(buildArg)
if err != nil { if err != nil {
return err return fmt.Errorf("Error: Invalid number or missing job number. eg 100")
} }
} }
@ -72,7 +72,7 @@ func buildLogs(c *cli.Context) error {
if err = dec.Decode(&line); err != nil { if err = dec.Decode(&line); err != nil {
return err return err
} }
fmt.Printf("%s\n", line.Out) fmt.Printf("%s", line.Out)
} }
_, err = dec.Token() _, err = dec.Token()

10
server/hook.go
View file

@ -422,6 +422,10 @@ func (b *builder) Build() ([]*buildItem, error) {
environ[k] = v environ[k] = v
} }
for k, v := range axis {
environ[k] = v
}
secrets := map[string]string{} secrets := map[string]string{}
for _, sec := range b.Secs { for _, sec := range b.Secs {
if !sec.MatchEvent(b.Curr.Event) { if !sec.MatchEvent(b.Curr.Event) {
@ -439,9 +443,11 @@ func (b *builder) Build() ([]*buildItem, error) {
} }
y := b.Yaml y := b.Yaml
if s, err := envsubst.Eval(y, sub); err != nil { s, err := envsubst.Eval(y, sub)
y = s if err != nil {
return nil, err
} }
y = s
parsed, err := yaml.ParseString(y) parsed, err := yaml.ParseString(y)
if err != nil { if err != nil {