Travis: sudo: false, install Neovim through bot-ci script

This commit is contained in:
Daniel Hahler 2016-12-10 16:37:33 +01:00
parent c53ecd3acd
commit b04bb57981
2 changed files with 8 additions and 12 deletions

View File

@ -1,5 +1,5 @@
language: ruby
sudo: required
sudo: false
env:
global:
- DEPS=$HOME/deps
@ -30,13 +30,10 @@ install: |
ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
return
elif [ "$ENV" == "neovim" ]; then
# https://github.com/neovim/neovim/wiki/Installing-Neovim
sudo apt-get install -y software-properties-common
sudo add-apt-repository -y ppa:neovim-ppa/unstable
sudo apt-get update -y
sudo apt-get install -y neovim
# https://github.com/neovim/bot-ci#nightly-builds
eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64"
mkdir -p ${DEPS}/bin
ln -s /usr/bin/nvim ${DEPS}/bin/vim
ln -s $(which nvim) ${DEPS}/bin/vim
return
fi

View File

@ -109,13 +109,12 @@ clone_repos
prepare
git --version
VIM=$(select_vim)
vim=$(select_vim)
echo "Selected Vim: $VIM"
if [ "$1" = '!' ]; then
$VIM -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
$vim -Nu $TEMP/mini-vimrc -c 'Vader! test.vader' > /dev/null &&
prepare &&
$VIM -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
$vim -Nu $TEMP/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null
else
$VIM -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
$vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
fi