From 01e7540530ed3937c0cf11010ea193b2e0224897 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 22 Jan 2019 13:13:11 +0100 Subject: [PATCH] Fix makefile --- .drone1.yml | 6 ------ Makefile | 9 +++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.drone1.yml b/.drone1.yml index f121ef82464..576f8c895b7 100644 --- a/.drone1.yml +++ b/.drone1.yml @@ -114,7 +114,6 @@ steps: GOPATH: /srv/app commands: - make release-windows - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: static-build-linux @@ -124,7 +123,6 @@ steps: GOPATH: /srv/app commands: - make release-linux - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: static-build-darwin @@ -134,7 +132,6 @@ steps: GOPATH: /srv/app commands: - make release-darwin - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: after-build-static @@ -308,7 +305,6 @@ steps: GOPATH: /srv/app commands: - make release-windows - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: static-build-linux @@ -318,7 +314,6 @@ steps: GOPATH: /srv/app commands: - make release-linux - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: static-build-darwin @@ -328,7 +323,6 @@ steps: GOPATH: /srv/app commands: - make release-darwin - - mv /build/* binaries/ depends_on: [ before-static-build ] - name: after-build-static diff --git a/Makefile b/Makefile index a974a5dcef3..312d020a04b 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,9 @@ release-windows: go install $(GOFLAGS) github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out vikunja-$(VERSION) . +ifneq ($(DRONE_WORKSPACE),'') + mv /build/* $(DIST)/binaries +endif .PHONY: release-linux release-linux: @@ -123,6 +126,9 @@ release-linux: go install $(GOFLAGS) github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out vikunja-$(VERSION) . +ifneq ($(DRONE_WORKSPACE),'') + mv /build/* $(DIST)/binaries +endif .PHONY: release-darwin release-darwin: @@ -130,6 +136,9 @@ release-darwin: go install $(GOFLAGS) github.com/karalabe/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out vikunja-$(VERSION) . +ifneq ($(DRONE_WORKSPACE),'') + mv /build/* $(DIST)/binaries +endif .PHONY: release-copy release-copy: