about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Dunn <dunn.alex@gmail.com>2017-04-14 17:05:41 -0700
committerEugen <eugen@zeonfederated.com>2017-04-15 02:05:41 +0200
commit8482f67cafabbd747126238c03853f251e0dce56 (patch)
tree5a996d7e454b2ce3bb76e3c1f1cf70b687a972c7
parentfe8dd58bc1548b59741d30d9b3ce46f08b6afcd8 (diff)
update Node to 6.x LTS (#1228)
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
-rw-r--r--.nvmrc2
-rw-r--r--.travis.yml5
2 files changed, 2 insertions, 5 deletions
diff --git a/.nvmrc b/.nvmrc
index f0e13c509..1e8b31496 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-6.7.0
+6
diff --git a/.travis.yml b/.travis.yml
index a9824ccf7..45a71d83c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,6 @@ notifications:
   email: false
 
 env:
-  matrix:
-    - TRAVIS_NODE_VERSION="4"
   global:
     - LOCAL_DOMAIN=cb6e6126.ngrok.io
     - LOCAL_HTTPS=true
@@ -28,8 +26,7 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get -qq install g++-4.8
 install:
-  - nvm install $TRAVIS_NODE_VERSION
-  - npm install -g npm@3
+  - nvm install
   - npm install -g yarn
   - bundle install
   - yarn install