From 9e35089cebde4b247c91bf3672fb10cea601d3e2 Mon Sep 17 00:00:00 2001
From: Joshua Wiens <wiens.joshua@gmail.com>
Date: Thu, 5 Oct 2017 00:37:19 -0500
Subject: [PATCH] ci: Update npm & webpack versions for travis

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a4cc878..c44559b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,22 @@ sudo: false
 language: node_js
 branches:
   only:
-    - v2
+    - master
 matrix:
   fast_finish: true
   include:
     - os: linux
-      node_js: "7"
-      env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
+      node_js: "8"
+      env: WEBPACK_VERSION="3.6.0" JOB_PART=lint
     - os: linux
       node_js: "6"
-      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+      env: WEBPACK_VERSION="3.6.0" JOB_PART=test
     - os: linux
       node_js: "4.7"
-      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+      env: WEBPACK_VERSION="3.6.0" JOB_PART=test
     - os: linux
-      node_js: "7"
-      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+      node_js: "8"
+      env: WEBPACK_VERSION="3.6.0" JOB_PART=test
 before_install:
   - nvm --version
   - node --version