Merge pull request #49 from stelligent/develop

Fix issue with install script picking up from develop branch
stelligent · Jan 5, 2017 · a0f164f · a0f164f
2 parents 63da028 + 6df177d
commit a0f164f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,4 +33,11 @@ deploy:
     skip_cleanup: true
     script: make release
     on:
-      branch: master
+      branch: master
+
+## Send notifiations to 'builds' channel
+notifications:
+  email: false
+  slack:
+    on_success: change
+    secure: g7a0GZU36Ix+6IhwWoPZCTDIG4JrqQj4ZW5yYU+nIwLahrxWm2FknztNrNBS/akswVAZFfvgFRsPJWY2SdLcCYGWmVb62VRlKrKiiXUFjXG2/RXRRk3Ivmm7ZMEWe9xFbvK8OwwV6aVK/A+lepB0ory5EE5kwdYCvDj2OWj3Hjeoy7vVMrVcFn+MnUek81XWRzdN0aiTeGZrDA/eT1BNyytk90Mc7AYsAsuMlRelo9s3x9bk0dVqjIpVJZ13+R/Kdoc/N8q1GznwaXScTfhG0UW/aLYLhlWy76QISsQUqM1wOPtuuRmnkezR7NOyEh8Bdo4NfuYfDFWhDru9mHuNMMXJKdh6R51uWmiTNxflZ2la2IoONDsQ/5PAhyVBqGbc30vqVF3IkLNkI+w3rGxI6+1dcBB+otpvwm6e/dQ0azHT8t5bdT2XJXndsdbDeVyAr2XHG01tHRrxZFG2eeEXCqabvNPI0vRqdo193W0eP0fnUDHUMrx1wHbVSEDrbzwM3DcOE9ZYzVv0YByXf8HHsRHNDUj+WjeeGFbYcOaGw3XQYZZ4ooqa9ttvA6dKvbrS9+JeePgfT/vKhEdUqbRZtn8zUBbNiEmT0cIaiF73kmjZh3+kep66hTji/NchAroTD/VQzgTmj2+8/p/uqU/7jSMa0COevb+xx1rgMPpHLV0=
diff --git a/Makefile b/Makefile
@@ -60,6 +60,9 @@ release: dev-release
 ifneq ($(IS_MASTER),)
 	@echo "=== releasing $(VERSION) ==="
 	github-release edit -u $(ORG) -r $(PACKAGE) -t $(TAG_VERSION)
+
+	github-release info -u $(ORG) -r $(PACKAGE) -t $(TAG_VERSION)-develop && github-release delete -u $(ORG) -r $(PACKAGE) -t $(TAG_VERSION)-develop || echo "No pre-release to cleanup"
+	git push --delete origin $(TAG_VERSION)-develop || echo "No pre-release tag to delete"
 endif
 
 clean:

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ For more details on the intended architecture, see [Microservices Platform with
 curl -s https://raw.githubusercontent.com/stelligent/mu/master/install.sh | sh
 
 # Install v0.1.0 version to ~/bin
-curl -s https://raw.githubusercontent.com/stelligent/mu/master/install.sh | INSTALL_VERSION=0.1.0 INSTALL_PATH=~/bin sh
+curl -s https://raw.githubusercontent.com/stelligent/mu/master/install.sh | INSTALL_VERSION=0.1.0 INSTALL_DIR=~/bin sh
 ```
 
 ## Commands

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+0.1.1
diff --git a/install.sh b/install.sh
@@ -4,7 +4,7 @@
 set -e
 
 REPO=stelligent/mu
-LATEST_VERSION=`curl -s https://raw.githubusercontent.com/$REPO/develop/VERSION`
+LATEST_VERSION=`curl -s https://raw.githubusercontent.com/$REPO/master/VERSION`
 INSTALL_VERSION=${INSTALL_VERSION:-$LATEST_VERSION}
 INSTALL_DIR=${INSTALL_DIR:-/usr/local/bin}
 INSTALL_PATH="${INSTALL_DIR%/}/mu"