From 9cc91f71083f657a35c0fd0bd6f632f0cb3c98c2 Mon Sep 17 00:00:00 2001
From: Cory Bennett <cbennett@netflix.com>
Date: Wed, 6 Sep 2017 12:29:06 -0700
Subject: [PATCH] use xgo tool rather than docker image directly

---
 .gitignore         |  1 +
 .jira.d/config.yml |  2 ++
 Makefile           | 25 +++++--------------------
 3 files changed, 8 insertions(+), 20 deletions(-)
 create mode 100644 .jira.d/config.yml

diff --git a/.gitignore b/.gitignore
index 5d7fa37..4138cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jira
 schemas/*.json
 t/.gnupg/random_seed
 t/issue.props
+dist
\ No newline at end of file
diff --git a/.jira.d/config.yml b/.jira.d/config.yml
new file mode 100644
index 0000000..8271253
--- /dev/null
+++ b/.jira.d/config.yml
@@ -0,0 +1,2 @@
+config:
+  stop: true
diff --git a/Makefile b/Makefile
index 49d6747..376798c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,3 @@
-PLATFORMS= \
-	freebsd/amd64 \
-	linux/386 \
-	linux/amd64 \
-	windows/386 \
-	windows/amd64 \
-	darwin/amd64 \
-	$(NULL)
-
-	# freebsd-386 \
-	# freebsd-arm \
-	# linux-arm \
-	# openbsd-386 \
-	# openbsd-amd64 \
-	# darwin-386
-
 NAME=jira
 
 OS=$(shell uname -s)
@@ -53,11 +37,11 @@ lint:
 	@golint ./jiradata
 	@golint ./cmd/jira
 
-all: 
-	docker pull karalabe/xgo-latest
+all:
+	go get -u github.com/karalabe/xgo
 	rm -rf dist
 	mkdir -p dist
-	docker run --rm -e EXT_GOPATH=/gopath -v $$(pwd):/gopath/src/gopkg.in/Netflix-Skunkworks/go-jira.v1 -e TARGETS="$(PLATFORMS)" -v $$(pwd)/dist:/build karalabe/xgo-latest gopkg.in/Netflix-Skunkworks/go-jira.v1/cmd/jira
+	xgo --targets="freebsd/amd64,linux/386,linux/amd64,windows/386,windows/amd64,darwin/amd64" -dest ./dist -ldflags="-w -s" ./cmd/jira
 
 install:
 	${MAKE} GOBIN=$$HOME/bin build
@@ -66,7 +50,7 @@ NEWVER ?= $(shell echo $(CURVER) | awk -F. '{print $$1"."$$2"."$$3+1}')
 TODAY  := $(shell date +%Y-%m-%d)
 
 changes:
-	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD *.go jiracli/*.go jiradata/*.go jiracmd/*.go cmd/*/*.go | grep -vE 'gofmt|go fmt'
+	@git log --pretty=format:"* %s [%cn] [%h]" --no-merges ^v$(CURVER) HEAD *.go jiracli/*.go jiradata/*.go jiracmd/*.go cmd/*/*.go glide.* | grep -vE 'gofmt|go fmt|version bump'
 
 update-changelog:
 	@echo "# Changelog" > CHANGELOG.md.new; \
@@ -83,6 +67,7 @@ update-changelog:
 
 release:
 	git commit -m "Updated Changelog" CHANGELOG.md; \
+    git commit -m "version bump" jira.go
 	git tag v$(NEWVER)
 	git push --tags