Skip to content

Commit

Permalink
fix(build): decrypt credentials only on master
Browse files Browse the repository at this point in the history
  • Loading branch information
silvolu committed Sep 17, 2014
1 parent 9f45035 commit b60ccbc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b60ccbc

Please sign in to comment.