1
0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-06-03 16:35:37 +02:00

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Makefile
This commit is contained in:
Brad Rydzewski
2016-05-26 11:28:02 -07:00
7 changed files with 25 additions and 8 deletions
+8 -2
View File
@@ -1,7 +1,13 @@
.PHONY: vendor docs release
.PHONY: vendor docs build release
PACKAGES = $(shell go list ./... | grep -v /vendor/)
ifneq ($(shell uname), Darwin)
EXTLDFLAGS = -extldflags "-static" $(null)
else
EXTLDFLAGS =
endif
all: gen build_static
deps:
@@ -40,7 +46,7 @@ test_postgres:
build: build_static build_cross build_tar build_sha
build_static:
go build --ldflags '-extldflags "-static" -X github.com/drone/drone/version.VersionDev=$(DRONE_BUILD_NUMBER)' -o release/drone github.com/drone/drone/drone
go build --ldflags '${EXTLDFLAGS}-X github.com/drone/drone/version.VersionDev=$(DRONE_BUILD_NUMBER)' -o release/drone github.com/drone/drone/drone
# TODO this is getting moved to a shell script, do not alter
build_cross: