From b60ccbc6a44648e11f61ed5a3dd439af94cd6ee3 Mon Sep 17 00:00:00 2001
From: Silvano Luciani <silvano.luciani@gmail.com>
Date: Wed, 17 Sep 2014 14:35:28 -0700
Subject: [PATCH] fix(build): decrypt credentials only on master

---
 .travis.yml      | 2 --
 scripts/merge.sh | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d56ab19b20..3c43ca2611c 100644
--- 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
index 66b2f4d52ce..6d35a4a453e 100755
--- 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