Merge pull request #219 from silvolu/fix-build

fix(build): decrypt credentials only on master
googleapis · Sep 17, 2014 · 91c7036 · 91c7036
2 parents 9f45035 + b60ccbc
commit 91c7036
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 node_js:
 - 0.10
-before_install:
-- openssl aes-256-cbc -K $encrypted_b8aa0887832a_key -iv $encrypted_b8aa0887832a_iv -in key.json.enc -out key.json -d
 script:
 - npm run lint
 - npm run test

diff --git a/scripts/merge.sh b/scripts/merge.sh
@@ -18,5 +18,6 @@ set -ev
 
 # 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
   npm run regression-test
 fi