fixed some minor bugs in build
This commit is contained in:
parent
1ef6dc0bc6
commit
d66becd12c
4 changed files with 24 additions and 8 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -19,4 +19,8 @@ bindata.go
|
|||
|
||||
drone
|
||||
drone-build
|
||||
drone-bot
|
||||
drone-bot
|
||||
|
||||
bin/drone
|
||||
bin/drone-build
|
||||
bin/drone-bot
|
||||
|
|
13
Makefile
13
Makefile
|
@ -1,3 +1,5 @@
|
|||
.PHONY: dist
|
||||
|
||||
SHA := $(shell git rev-parse --short HEAD)
|
||||
VERSION := 0.4.0-alpha
|
||||
|
||||
|
@ -11,7 +13,7 @@ test:
|
|||
go test -cover -short ./...
|
||||
|
||||
build:
|
||||
go build -ldflags "-X main.revision $(SHA) -X main.version $(VERSION).$(SHA)"
|
||||
go build -o bin/drone -ldflags "-X main.revision $(SHA) -X main.version $(VERSION).$(SHA)"
|
||||
|
||||
clean:
|
||||
find . -name "*.out" -delete
|
||||
|
@ -33,3 +35,12 @@ bindata_debug:
|
|||
|
||||
bindata:
|
||||
$$GOPATH/bin/go-bindata server/static/...
|
||||
|
||||
# creates a debian package for drone
|
||||
# to install `sudo dpkg -i drone.deb`
|
||||
dist:
|
||||
mkdir -p dist/drone/usr/local/bin
|
||||
mkdir -p dist/drone/var/lib/drone
|
||||
mkdir -p dist/drone/var/cache/drone
|
||||
cp bin/drone dist/drone/usr/local/bin
|
||||
-dpkg-deb --build dist/drone
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue