Need to commit changes for pushing to OpenShift, but only deploy to the dist branch for tags.

Author: dlabrecq

.travis.yml

@@ -23,7 +23,7 @@ deploy:
   app: angular
   skip_cleanup: true
   on:
-    branch: master-dist
+    branch: master
     condition: $TRAVIS_REPO_SLUG = "patternfly/angular-patternfly"
 
 notifications:

scripts/publish.sh

@@ -2,12 +2,6 @@
 
 set -o errexit -o nounset
 
-if [ -z "$TRAVIS_TAG" -a "$TRAVIS_BRANCH" != "master" ]
-then
-  echo "This commit was made against $TRAVIS_BRANCH and not the master or tag! Do not deploy!"
-  exit 1
-fi
-
 # User info
 git config user.name "Admin"
 git config user.email "[email protected]"
@@ -20,7 +14,15 @@ git remote add upstream https://[email protected]/$TRAVIS_REPO_SLUG.git
 git add dist --force
 git commit -m "Added files generated by Travis build"
 
-# Push to releases branch
+# Must commit changes for pushing to OpenShift, but
+# only deploy to the dist branch for tags.
+if [ -z "$TRAVIS_TAG" -a "$TRAVIS_BRANCH" != "master" ]
+then
+  echo "This commit was made against $TRAVIS_BRANCH and not the master or tag! Do not deploy to $TRAVIS_BRANCH-dist"
+  exit
+fi
+
+# Push to dist branch
 EXISTING=`git ls-remote --heads https://github.com/"$TRAVIS_REPO_SLUG".git "$TRAVIS_BRANCH"-dist`
 
 if [ -z "$TRAVIS_TAG" ]
@@ -35,5 +37,3 @@ then
     git push upstream $TRAVIS_BRANCH:$TRAVIS_BRANCH-dist --force -v
   fi
 fi
-
-exit $?