Travis CI: sudo: false (#561)

This commit is contained in:
Daniel Hahler 2017-01-01 04:08:09 +01:00 committed by Junegunn Choi
parent 0b1343b582
commit d5e9f91c7b
2 changed files with 9 additions and 13 deletions

View file

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

View file

@ -113,13 +113,12 @@ clone_repos
prepare prepare
git --version git --version
VIM=$(select_vim) vim=$(select_vim)
echo "Selected Vim: $VIM" echo "Selected Vim: $vim"
if [ "${1:-}" = '!' ]; then 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 && 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 else
$VIM -Nu $TEMP/mini-vimrc -c 'Vader test.vader' $vim -Nu $TEMP/mini-vimrc -c 'Vader test.vader'
fi fi