From 179f437c35f61fcc1e0fc19b65bc2db1c8b08b09 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 15:55:19 -0500 Subject: [PATCH] Travis: fix node version Signed-off-by: Jeffrey Morgan --- .travis.yml | 14 +++++++------- ci/install | 7 +++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100755 ci/install diff --git a/.travis.yml b/.travis.yml index 434c6e7bd3..077a5968b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,22 +2,22 @@ cache: directories: - node_modules -before_install: - - brew unlink node - - brew update - - brew install homebrew/versions/node4-lts +install: ./ci/install script: - npm install - '[ "${TRAVIS_OS_NAME}" = "linux" ] && npm test || 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}" = "linux" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false' + - '[ "${TRAVIS_OS_NAME}" = "osx" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release-mac || false' matrix: include: - os: linux services: - - docker + - docker + language: node_js + node_js: + - "4.1" - os: osx language: generic diff --git a/ci/install b/ci/install new file mode 100755 index 0000000000..0851c751f6 --- /dev/null +++ b/ci/install @@ -0,0 +1,7 @@ +#!/bin/bash + +if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + brew unlink node + brew update + brew install homebrew/versions/node4-lts +fi