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
googleapis · Oct 23, 2014 · 8ac1859 · 8ac1859
1 parent 029f3a5
commit 8ac1859
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 → scripts/build.sh b/scripts/merge.sh → 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