From 8ac1859094e8efd747212375e5e2506ef9782049 Mon Sep 17 00:00:00 2001
From: Silvano Luciani <silvano.luciani@gmail.com>
Date: Thu, 23 Oct 2014 09:00:24 -0700
Subject: [PATCH] fix(build): run regression tests as part of the build script

Previously the regression tests were run in the after_success step, which meant that a failure would not influence the result of the build
---
 .travis.yml                    | 5 +----
 scripts/{merge.sh => build.sh} | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename scripts/{merge.sh => build.sh} (98%)

diff --git a/.travis.yml b/.travis.yml
index baaaeb8a7a7..5bae7eabd29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 language: node_js
 node_js:
 - 0.10
-script:
-- npm run lint
-- npm run test
-after_success: ./scripts/merge.sh
+script: ./scripts/build.sh
 before_deploy: ./scripts/release.sh
 deploy:
   provider: npm
diff --git a/scripts/merge.sh b/scripts/build.sh
similarity index 98%
rename from scripts/merge.sh
rename to scripts/build.sh
index c6601256b4b..714a1fa0e02 100755
--- a/scripts/merge.sh
+++ b/scripts/build.sh
@@ -16,6 +16,9 @@
 
 set -ev
 
+npm run lint
+npm run test
+
 # if merging to master and not a pull request, execute regression tests and update docs
 if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
   openssl aes-256-cbc -K $encrypted_b8aa0887832a_key -iv $encrypted_b8aa0887832a_iv -in key.json.enc -out key.json -d