From efe86942d0894901343d74a570571d112540b573 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 7 Oct 2018 18:50:41 +0200 Subject: [PATCH] Pin xgo to golang 1.10 to avoid issues Signed-off-by: Thomas Boerger --- .drone.yml | 6 +++--- CHANGELOG.md | 1 + Makefile | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 577dfa4..b962c84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -83,7 +83,7 @@ pipeline: - make build app-windows: - image: karalabe/xgo-latest:latest + image: karalabe/xgo-1.10:latest pull: true group: release environment: @@ -96,7 +96,7 @@ pipeline: event: [ push, tag ] app-linux: - image: karalabe/xgo-latest:latest + image: karalabe/xgo-1.10:latest pull: true group: release environment: @@ -109,7 +109,7 @@ pipeline: event: [ push, tag ] app-darwin: - image: karalabe/xgo-latest:latest + image: karalabe/xgo-1.10:latest pull: true group: release environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index a264983..dd02d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added * Add basic documentation +* Use xgo 1.10 for cross-compiling ## [0.1.0] - 2018-09-24 diff --git a/Makefile b/Makefile index df97c32..76f1cd2 100644 --- a/Makefile +++ b/Makefile @@ -97,28 +97,28 @@ release-dirs: .PHONY: release-windows release-windows: ifeq ($(CI),drone) - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) mv /build/* $(DIST)/binaries else - retool do xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + retool do xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) endif .PHONY: release-linux release-linux: ifeq ($(CI),drone) - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) mv /build/* $(DIST)/binaries else - retool do xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + retool do xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) endif .PHONY: release-darwin release-darwin: ifeq ($(CI),drone) - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) mv /build/* $(DIST)/binaries else - retool do xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) + retool do xgo -go 1.10 -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out $(EXECUTABLE)-$(VERSION) ./cmd/$(NAME) endif .PHONY: release-copy