From e9e8873d7a702dbda7f7d1febc4eef8bff480365 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Sun, 2 Oct 2016 10:18:34 +0100 Subject: [PATCH] chore(ci): use node 4 instead of 5 --- .appveyor.yml | 3 ++- .travis.yml | 42 +++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d9cd073ebc96..6d3c82f53721 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,6 @@ environment: matrix: - - nodejs_version: "5.0" + - nodejs_version: "4.0" - nodejs_version: "6.0" matrix: @@ -8,6 +8,7 @@ matrix: install: - ps: Install-Product node $env:nodejs_version + - npm install -g npm - npm install test_script: diff --git a/.travis.yml b/.travis.yml index cd2b7f8c4631..f821a853b7c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,9 @@ dist: trusty sudo: required language: node_js node_js: - - "5" - - "6" + - "4" os: - linux - - osx env: global: - DBUS_SESSION_BUS_ADDRESS=/dev/null @@ -20,25 +18,34 @@ env: matrix: fast_finish: true allow_failures: + - node_js: "5" - os: osx - env: NODE_SCRIPT="tests/e2e_runner.js --nightly" - exclude: + include: + - node_js: "5" + os: linux + env: SCRIPT=test + - node_js: "5" + os: linux + env: NODE_SCRIPT=tests/e2e_runner.js - node_js: "6" - env: SCRIPT=lint - - os: osx - env: NODE_SCRIPT="tests/e2e_runner.js --nightly" + os: linux + env: SCRIPT=test - node_js: "6" - env: NODE_SCRIPT="tests/e2e_runner.js --nightly" - - os: osx - node_js: "5" - env: SCRIPT=lint + os: linux + env: NODE_SCRIPT=tests/e2e_runner.js + - node_js: "4" + os: osx + env: SCRIPT=test + - node_js: "4" + os: osx + env: NODE_SCRIPT=tests/e2e_runner.js - node_js: "6" - env: SCRIPT=build - - os: osx - node_js: "5" - env: SCRIPT=build - - os: osx - env: TARGET=mobile SCRIPT=mobile_test + os: osx + env: SCRIPT=test + - node_js: "6" + os: osx + env: NODE_SCRIPT=tests/e2e_runner.js before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi @@ -50,6 +57,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi - if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi + - npm install -g npm - npm config set spin false - npm config set progress false