Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions scripts/merge.sh → scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down