Merge pull request #870 from remind101/release-0.10.1

Bump to 0.10.1
remind101 · Jun 14, 2016 · 06d6a2c · 06d6a2c
2 parents bda590a + 6999a26
commit 06d6a2c
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.10.0
+current_version = 0.10.1
 commit = True
 tag = False
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## HEAD
+## 0.10.1 (2016-06-14)
 
 **Features**
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM golang:1.5.3
 MAINTAINER Eric Holmes <[email protected]>
 
-LABEL version 0.10.0
+LABEL version 0.10.1
 
 ADD . /go/src/github.com/remind101/empire
 WORKDIR /go/src/github.com/remind101/empire

diff --git a/Makefile b/Makefile
@@ -2,6 +2,7 @@
 
 REPO = remind101/empire
 TYPE = patch
+ARTIFACTS = ${CIRCLE_ARTIFACTS}
 
 cmds: build/empire build/emp
 
@@ -36,8 +37,7 @@ bump:
 release: release/docker release/emp release/empire release/github
 
 release/github::
-	go get -u github.com/progrium/gh-release
-	gh-release create remind101/empire $(shell cat VERSION)
+	./bin/release $(ARTIFACTS)
 
 release/docker::
 	# Wait for the `master` branch to build on CircleCI before running this. We'll
@@ -46,15 +46,15 @@ release/docker::
 	docker tag ${REPO}:${CIRCLE_SHA1} ${REPO}:$(shell cat VERSION)
 	docker push ${REPO}:$(shell cat VERSION)
 
-release/emp: release/emp-Linux-x86_64 release/emp-Darwin-x86_64
-release/empire: release/empire-Linux-x86_64 release/empire-Darwin-x86_64
+release/emp: $(ARTIFACTS)/emp-Linux-x86_64 $(ARTIFACTS)/emp-Darwin-x86_64
+release/empire: $(ARTIFACTS)/empire-Linux-x86_64 $(ARTIFACTS)/empire-Darwin-x86_64
 
-release/emp-Linux-x86_64:
+$(ARTIFACTS)/emp-Linux-x86_64:
 	env GOOS=linux go build -o $@ ./cmd/emp
-release/emp-Darwin-x86_64:
+$(ARTIFACTS)/emp-Darwin-x86_64:
 	env GOOS=darwin go build -o $@ ./cmd/emp
 
-release/empire-Linux-x86_64:
+$(ARTIFACTS)/empire-Linux-x86_64:
 	env GOOS=linux go build -o $@ ./cmd/empire
-release/empire-Darwin-x86_64:
+$(ARTIFACTS)/empire-Darwin-x86_64:
 	env GOOS=darwin go build -o $@ ./cmd/empire
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.10.0
+0.10.1
diff --git a/circle.yml b/circle.yml
@@ -12,6 +12,7 @@ checkout:
 
 dependencies:
   pre:
+    - go get github.com/aktau/github-release
     - sudo pip install awscli
     - go install -a -race std
     - go version

diff --git a/cmd/emp/README.md b/cmd/emp/README.md
@@ -7,7 +7,7 @@ A CLI for Empire.
 You can always download the latest version with:
 
 ```console
-$ curl -L https://github.com/remind101/empire/releases/download/v0.10.0/emp-`uname -s`-`uname -m` \
+$ curl -L https://github.com/remind101/empire/releases/download/v0.10.1/emp-`uname -s`-`uname -m` \
   > /usr/local/bin/emp
 ```
 

diff --git a/cmd/emp/dev.go b/cmd/emp/dev.go
@@ -1,5 +1,5 @@
 package main
 
 const (
-	Version = "0.10.0"
+	Version = "0.10.1"
 )
diff --git a/scheduler/cloudformation/templates/basic.json b/scheduler/cloudformation/templates/basic.json
@@ -11,7 +11,7 @@
   },
   "Outputs": {
     "EmpireVersion": {
-      "Value": "0.10.0"
+      "Value": "0.10.1"
     },
     "Release": {
       "Value": "v1"

diff --git a/scheduler/cloudformation/templates/fast.json b/scheduler/cloudformation/templates/fast.json
@@ -11,7 +11,7 @@
   },
   "Outputs": {
     "EmpireVersion": {
-      "Value": "0.10.0"
+      "Value": "0.10.1"
     },
     "Release": {
       "Value": "v1"

diff --git a/scheduler/cloudformation/templates/https.json b/scheduler/cloudformation/templates/https.json
@@ -11,7 +11,7 @@
   },
   "Outputs": {
     "EmpireVersion": {
-      "Value": "0.10.0"
+      "Value": "0.10.1"
     },
     "Release": {
       "Value": "v1"

diff --git a/version.go b/version.go
@@ -1,3 +1,3 @@
 package empire
 
-const Version = "0.10.0"
+const Version = "0.10.1"