Merge pull request #443 from 18F/travis-deploy

build on all branches, only deploy on certain and tags

.travis.yml

@@ -15,11 +15,6 @@ install:
 script:
 - npm test
 - "./codecheck.sh -u"
-branches:
-  only:
-  - master
-  - staging
-  - deprecated
 before_deploy:
 - export BUILD_INFO=build::$TRAVIS_BRANCH::$(date -u "+%Y-%m-%d-%H-%M-%S")::$TRAVIS_BUILD_NUMBER::$(deploy/npm-version.sh)
 # Extract any encrypted env vars and put them into the manifests/manifest-master.yml
@@ -47,6 +42,14 @@ deploy:
 - provider: script
   skip_cleanup: true
   script: deploy/travis_deploy.sh
+  on:
+    branch:
+    - master
+    - staging
+    - deprecated
+- provider: script		
+  skip_cleanup: true		
+  script: deploy/travis_deploy.sh		
   on:
     tags: true
 env:

deploy/travis_deploy.sh

@@ -10,7 +10,7 @@
 set -e
 
 CF_PATH="."
-if [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]
+if [[ "$TRAVIS_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]
 then
 	CF_MANIFEST="manifests/manifest-prod.yml"
 	CF_SPACE="deck-prod"