From 4231d52169b0e5d3cc8fc14057d59326832fd407 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Mon, 5 Dec 2016 15:05:41 -0800
Subject: [PATCH] chore(travis): cleanup the tests on Travis and Appveyor.

Remove OSX tests for Node 4, remove tests for Node 5. Other cleanup tasks.

Also remove the Node 4 test on Windows, now Node 6 only.
---
 .appveyor.yml |  1 -
 .travis.yml   | 37 +++++++++++++++++--------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 6d3c82f53721..c2e095f9be51 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,5 @@
 environment:
   matrix:
-  - nodejs_version: "4.0"
   - nodejs_version: "6.0"
 
 matrix:
diff --git a/.travis.yml b/.travis.yml
index f821a853b7c7..f09e83ca2e5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,26 @@
 dist: trusty
 sudo: required
+
 language: node_js
-node_js:
-  - "4"
-os:
-  - linux
+
 env:
   global:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
-  matrix:
-    - SCRIPT=lint
-    - SCRIPT=build
-    - SCRIPT=test
-    - NODE_SCRIPT=tests/e2e_runner.js
-    - NODE_SCRIPT="tests/e2e_runner.js --nightly"
-#    - TARGET=mobile SCRIPT=mobile_test
+
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: "5"
     - os: osx
+    - node_js: "7"
     - env: NODE_SCRIPT="tests/e2e_runner.js --nightly"
   include:
-    - node_js: "5"
+    - node_js: "6"
       os: linux
-      env: SCRIPT=test
-    - node_js: "5"
+      env: SCRIPT=lint
+    - node_js: "6"
+      os: linux
+      env: SCRIPT=build
+    - node_js: "4"
       os: linux
       env: NODE_SCRIPT=tests/e2e_runner.js
     - node_js: "6"
@@ -34,17 +29,19 @@ matrix:
     - node_js: "6"
       os: linux
       env: NODE_SCRIPT=tests/e2e_runner.js
-    - node_js: "4"
-      os: osx
-      env: SCRIPT=test
-    - node_js: "4"
+    - node_js: "6"
       os: osx
       env: NODE_SCRIPT=tests/e2e_runner.js
+
+    # Optional builds.
     - node_js: "6"
       os: osx
       env: SCRIPT=test
     - node_js: "6"
-      os: osx
+      os: linux
+      env: NODE_SCRIPT="tests/e2e_runner.js --nightly"
+    - node_js: "7"
+      os: linux
       env: NODE_SCRIPT=tests/e2e_runner.js
 
 before_install: