github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-22 08:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some minor bugs in build

Browse Source
This commit is contained in:
Brad Rydzewski
2015-05-15 14:55:26 -07:00
parent 1ef6dc0bc6
commit d66becd12c
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/drone-build/client.go
View File

@@ -102,7 +102,7 @@ func run(client dockerclient.Client, conf *dockerclient.ContainerConfig, pull bo
id, err = client.CreateContainer(conf, "")
// make sure the container is removed in
// the event of a creation error.
if len(id) != 0 {
if err != nil && len(id) != 0 {
client.RemoveContainer(id, true, true)
}
if err != nil {

11
cmd/drone-build/run.go
View File

@@ -134,11 +134,12 @@ func runSteps(c *Context, steps map[string]*common.Step) (int, error) {
// verify the step matches the branch
// and other specifications
if step.Condition == nil ||
!step.Condition.MatchOwner(c.Repo.Owner) ||
!step.Condition.MatchBranch(c.Clone.Branch) ||
!step.Condition.MatchMatrix(c.Build.Environment) {
continue
if step.Condition != nil {
if !step.Condition.MatchOwner(c.Repo.Owner) ||
!step.Condition.MatchBranch(c.Clone.Branch) ||
!step.Condition.MatchMatrix(c.Build.Environment) {
continue
}
}
conf := toContainerConfig(step)