travis: add ubuntu bionic,xenial (#867)

Travis defaults to it since this year.
Ubuntu trusty reached EOL since April 2019.
Ubuntu bionic provides Vim 8.

Simplify OS install with Travis' apt addon
so that only Vim nightly will be compiled from source.

Ubuntu 14.04.6 provides ruby v.1.9.3, not 1.8.x or older.
Use it to test the ruby provider for backward compatibility.

Signed-off-by: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
This commit is contained in:
Jan Edmund Lazo 2019-08-16 23:46:09 -04:00 committed by Junegunn Choi
parent 8a44109329
commit 307b0f244d
2 changed files with 34 additions and 41 deletions

View File

@ -1,54 +1,51 @@
language: ruby language: minimal
dist: trusty
sudo: false
env: env:
global: global:
- DEPS=$HOME/deps - DEPS=$HOME/deps
- PATH=$DEPS/bin:$PATH - PATH=$DEPS/bin:$PATH
matrix: matrix:
include: include:
- env: ENV=vim74 - env: ENV=vim80-bionic
rvm: 1.8.7 dist: bionic
addons: { apt: { packages: [vim-nox] } } - env: ENV=vim-nightly
- env: ENV=python dist: trusty
rvm: 1.8.7 - env: ENV=neovim-stable
addons: { apt: { packages: [python2.7-dev] } } dist: xenial
- env: ENV=python3 addons: {apt: {packages: [neovim], sources: [{sourceline: 'ppa:neovim-ppa/stable'}]}}
rvm: 1.8.7 - env: ENV=neovim-nightly
addons: { apt: { packages: [python3-dev] } } dist: xenial
- env: ENV=ruby18 addons: {apt: {packages: [neovim], sources: [{sourceline: 'ppa:neovim-ppa/unstable'}]}}
rvm: 1.8.7 - env: ENV=vim74-trusty-python
- env: ENV=ruby20 dist: trusty
rvm: 2.0.0 - env: ENV=vim74-xenial-python3
- env: ENV=neovim dist: xenial
- env: ENV=vim8 - env: ENV=vim74-trusty-ruby
dist: trusty
addons: {apt: {packages: [vim-nox]}}
- env: ENV=vim74-xenial-ruby
dist: xenial
addons: {apt: {packages: [vim-nox]}}
install: | install: |
git config --global user.email "you@example.com" git config --global user.email "you@example.com"
git config --global user.name "Your Name" git config --global user.name "Your Name"
if [ "$ENV" == "vim74" ]; then C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui "
case "$ENV" in
vim-*)
;;
neovim-*)
mkdir -p ${DEPS}/bin
ln -s /usr/bin/nvim ${DEPS}/bin/vim
export VADER_OUTPUT_FILE=/dev/stderr
return
;;
vim74-* | vim80-*)
mkdir -p ${DEPS}/bin mkdir -p ${DEPS}/bin
ln -s /usr/bin/vim.nox ${DEPS}/bin/vim ln -s /usr/bin/vim.nox ${DEPS}/bin/vim
return return
elif [ "$ENV" == "neovim" ]; then ;;
# 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 $(which nvim) ${DEPS}/bin/vim
export VADER_OUTPUT_FILE=/dev/stderr
return return
fi
C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui "
case "$ENV" in
python)
C_OPTS+=--enable-pythoninterp
;;
python3)
C_OPTS+=--enable-python3interp
;;
ruby*)
C_OPTS+=--enable-rubyinterp
;; ;;
esac esac

View File

@ -18,10 +18,6 @@ Execute (Initialize test environment):
\ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction', \ ['function! ResetPlug()', 'let s:loaded = {}', 'endfunction',
\ 'function! CompareURI(a, b)', 'return s:compare_git_uri(a:a, a:b)', 'endfunction'] \ 'function! CompareURI(a, b)', 'return s:compare_git_uri(a:a, a:b)', 'endfunction']
if $ENV != 'vim8'
call add(patch, 'let s:vim8 = 0')
endif
call writefile(extend(readfile($PLUG_TMP), patch), $PLUG_TMP) call writefile(extend(readfile($PLUG_TMP), patch), $PLUG_TMP)
set t_Co=256 set t_Co=256