fix(bintray): add unique version to bin name

Author: Vaughn Dice

.travis.yml

@@ -36,10 +36,8 @@ install:
 script:
   - make test
   - make -C client/ bootstrap build test
-  - mv client/deis client/deis-linux-amd64
-  - GOOS=darwin GOARCH=amd64 make -C client build
-  - mv client/deis client/deis-darwin-amd64
   - make -C docs/ build test
+before_deploy: make dist prep-bintray-json
 deploy:
   - provider: script
     # ensure client/doc builds aren't removed

_scripts/ci/bintray-template.json

@@ -8,8 +8,10 @@
     "name": "0.0.0"
   },
   "files": [
-    { "includePattern": "client/deis-linux-amd64", "uploadPattern": "deis-linux-amd64" },
-    { "includePattern": "client/deis-darwin-amd64", "uploadPattern": "deis-darwin-amd64" }
+    {
+      "includePattern": "_dist/(.*)",
+      "uploadPattern": "$1"
+    }
   ],
   "publish": true
 }

client/Makefile

@@ -7,13 +7,16 @@ DEV_ENV_IMAGE := quay.io/deis/go-dev:0.5.0
 DEV_ENV_WORK_DIR := /go/src/${repo_path}
 DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
+DIST_DIR := _dist
 
 GO_FILES = $(wildcard *.go)
 GO_PACKAGES = cmd controller/api controller/client $(wildcard controller/models/*) parser $(wildcard pkg/*)
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 GOFMT = gofmt -e -l -s
 GOTEST = go test --cover --race -v
 
+VERSION := $(shell git describe --tags --abbrev=0 2>/dev/null)+$(shell git rev-parse --short HEAD)
+
 define check-static-binary
   if file $(1) | egrep -q "(statically linked|Mach-O)"; then \
     echo -n ""; \
@@ -33,9 +36,17 @@ build:
 	${DEV_ENV_CMD} make binary-build
 	@$(call check-static-binary,deis)
 
+build-all:
+	gox -verbose \
+	-os="linux darwin " \
+	-arch="amd64 386" \
+	-output="$(DIST_DIR)/deis-${VERSION}-{{.OS}}-{{.Arch}}" .
+
 binary-build:
 	go build -a -installsuffix cgo -ldflags '-s' -o deis .
 
+dist: build-all
+
 install:
 	cp deis $$GOPATH/bin