Properly move releases within drone builds

diff --git a/Makefile b/Makefile
index b0f6f70799146b9d7d802d35b0476bf95e6499f0..1de097b97566db4fa2172b4a502b4970853a5397 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,11 @@ $(EXECUTABLE): $(wildcard *.go)
        go build -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
 
 .PHONY: release
-release: release-build release-copy release-check
+release: release-dirs release-build release-copy release-check
+
+.PHONY: release-dirs
+release-dirs:
+       mkdir -p $(DIST)/binaries $(DIST)/release
 
 .PHONY: release-build
 release-build:
@@ -98,10 +102,12 @@ release-build:
                go get -u github.com/karalabe/xgo; \
        fi
        xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) $(IMPORT)
+ifeq ($(CI),drone)
+       mv /build/* $(DIST)/binaries
+endif
 
 .PHONY: release-copy
 release-copy:
-       mkdir -p $(DIST)/release
        $(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));)
 
 .PHONY: release-check