From 52e7f89571c974b295f79039f995beeb8e975cdb Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Wed, 7 Oct 2015 15:33:01 -0700 Subject: [PATCH 1/2] Split bin from prerelease guard so we can cross-compile dev builds --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f378bcea6..eddf2b0cf 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,12 @@ default: test dev ci: deps test -release: updatedeps test bin +release: updatedeps test releasebin bin: deps + @sh -c "$(CURDIR)/scripts/build.sh" + +releasebin: deps @grep 'const VersionPrerelease = ""' version.go > /dev/null ; if [ $$? -ne 0 ]; then \ echo "ERROR: You must remove prerelease tags from version.go prior to release."; \ exit 1; \ @@ -77,4 +80,4 @@ updatedeps: fi @echo "INFO: Currently on $(GITBRANCH) ($(GITSHA))" -.PHONY: bin checkversion ci default deps generate test testacc testrace updatedeps +.PHONY: bin checkversion ci default deps generate releasebin test testacc testrace updatedeps From e384df43976fb0b4302cd702cdfa885d02904b49 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Wed, 7 Oct 2015 16:51:04 -0700 Subject: [PATCH 2/2] Add warning that dev builds should not be shipped to production --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index eddf2b0cf..5737d0d60 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ ci: deps test release: updatedeps test releasebin bin: deps + @echo "WARN: `make bin` is for debug / test builds only. Use `make release` for release builds." @sh -c "$(CURDIR)/scripts/build.sh" releasebin: deps