Travis: use build matrix for dual os

This commit is contained in:
Jeffrey Morgan 2015-11-24 15:45:08 -05:00
parent d804a20527
commit f03f307b57
1 changed files with 8 additions and 5 deletions

View File

@ -1,6 +1,5 @@
cache: cache:
directories: directories:
- resources
- node_modules - node_modules
before_install: before_install:
@ -10,11 +9,15 @@ before_install:
script: script:
- npm install - npm install
- npm test
- '[ "${TRAVIS_OS_NAME}" = "linux" ] && npm test || false' - '[ "${TRAVIS_OS_NAME}" = "linux" ] && npm test || false'
- '[ "${TRAVIS_OS_NAME}" = "linux" && "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false' - '[ "${TRAVIS_OS_NAME}" = "linux" && "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false'
- '[ "${TRAVIS_OS_NAME}" = "osx" && "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release || false' - '[ "${TRAVIS_OS_NAME}" = "osx" && "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release || false'
os: matrix:
- osx include:
- linux - os: linux
services:
- docker
- os: osx
language: generic