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

Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Brad Rydzewski
2015-05-23 18:53:11 -07:00
parent 14f0ffb587 35d604659a
commit 259ac91526
598 changed files with 259201 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -7,11 +7,11 @@ all: concat bindata build
deps:
go get github.com/jteeuwen/go-bindata/...
go get -t -v ./...
test:
go vet ./...
go test -cover -short ./...
go vet github.com/drone/drone/pkg/...
go vet github.com/drone/drone/cmd/...
go test -cover -short github.com/drone/drone/pkg/...
build:
go build -o bin/drone -ldflags "-X main.revision $(SHA) -X main.version $(VERSION).$(SHA)" github.com/drone/drone/cmd/drone-server
@@ -22,11 +22,11 @@ run:
clean:
find . -name "*.out" -delete
rm -f drone
rm -f bindata.go
find . -name "*_bindata.go" -delete
rm -f bin/drone*
concat:
cat cmd/drone-server/static/scripts/drone.js \
cat cmd/drone-server/static/scripts/drone.js \
cmd/drone-server/static/scripts/services/*.js \
cmd/drone-server/static/scripts/filters/*.js \
cmd/drone-server/static/scripts/controllers/*.js \