]> cat aescling's git repositories - mastodon.git/commitdiff
update Node to 6.x LTS (#1228)
authorAlex Dunn <dunn.alex@gmail.com>
Sat, 15 Apr 2017 00:05:41 +0000 (17:05 -0700)
committerEugen <eugen@zeonfederated.com>
Sat, 15 Apr 2017 00:05:41 +0000 (02:05 +0200)
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.

.nvmrc
.travis.yml

diff --git a/.nvmrc b/.nvmrc
index f0e13c509025821bc44ae215533a6d4d332154d0..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-6.7.0
+6
index a9824ccf7d3a9866575f4d3a7c0148f085f181e6..45a71d83c457c3f9c99da9c541fbd54487da59dc 100644 (file)
@@ -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