Merge branch 'master' into hide-container-impl

3 files changed, 20 insertions, 0 deletions

diff --git a/ci/before_install.sh b/ci/before_install.sh
index f84ad935bc..f5a57ad657 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -37,3 +37,15 @@ else
   # https://github.com/travis-ci/travis-ci/issues/8363
   pip3 -q install --user --upgrade pip || true
 fi
+
+if [[ "${TRAVIS_OS_NAME}" == linux ]]; then
+  echo "Install node (LTS)"
+
+  if [ ! -f ~/.nvm/nvm.sh ]; then
+    curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh
+  fi
+
+  source ~/.nvm/nvm.sh
+  nvm install --lts
+  nvm use --lts
+fi
diff --git a/ci/build.bat b/ci/build.bat
index 25f949b5e4..9909d102a4 100644
--- a/ci/build.bat
+++ b/ci/build.bat
@@ -37,6 +37,9 @@ set PATH=C:\Ruby24\bin;%PATH%
 cmd /c gem.cmd install neovim || goto :error
 where.exe neovim-ruby-host.bat || goto :error
 
+cmd /c npm.cmd install -g neovim || goto :error
+where.exe neovim-node-host.cmd || goto :error
+
 mkdir .deps
 cd .deps
 cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error
diff --git a/ci/install.sh b/ci/install.sh
index c8a0c8825d..2fe4f88822 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -23,3 +23,8 @@ CC=cc pip3 -q install --user --upgrade neovim || true
 
 echo "Install neovim RubyGem."
 gem install --no-document --version ">= 0.2.0" neovim
+
+if [[ "${TRAVIS_OS_NAME}" == linux ]]; then
+  echo "Install neovim npm package"
+  npm install -g neovim
+fi