change mercurial to git

This commit is contained in:
Stanislav Seletskiy 2016-09-07 19:51:30 +07:00
parent 8d77e89d65
commit 7549874758
3 changed files with 6 additions and 6 deletions

View File

@ -6,7 +6,7 @@ python:
- 3.4
env:
- VIM_VERSION="74"
- VIM_VERSION="mercurial"
- VIM_VERSION="git"
# - VIM_VERSION="NEOVIM"
install:
@ -14,7 +14,7 @@ install:
- until sudo add-apt-repository ppa:kalakris/tmux -y; do sleep 10; done
- until sudo add-apt-repository ppa:neovim-ppa/unstable -y; do sleep 10; done
- until sudo apt-get update -qq; do sleep 10; done
- until sudo apt-get install -qq -y --force-yes tmux xclip gdb neovim mercurial; do sleep 10; done
- until sudo apt-get install -qq -y --force-yes tmux xclip gdb neovim git; do sleep 10; done
- ./travis_install.sh
script:

View File

@ -14,8 +14,8 @@ build_vanilla_vim () {
until curl ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 -o vim.tar.bz2; do sleep 10; done
tar xjf vim.tar.bz2
cd vim${VIM_VERSION}
elif [[ $VIM_VERSION == "mercurial" ]]; then
hg clone https://vim.googlecode.com/hg/ vim
elif [[ $VIM_VERSION == "git" ]]; then
git clone https://github.com/vim/vim
cd vim
fi
@ -53,7 +53,7 @@ build_vanilla_vim () {
rm -rf vim_build
}
if [[ $VIM_VERSION = "74" || $VIM_VERSION = "mercurial" ]]; then
if [[ $VIM_VERSION = "74" || $VIM_VERSION = "git" ]]; then
build_vanilla_vim
elif [[ $VIM_VERSION == "NEOVIM" ]]; then
PIP=$(which pip)

View File

@ -5,7 +5,7 @@ set -ex
PYTHON="python${TRAVIS_PYTHON_VERSION}"
PYTHON_CMD="$(which ${PYTHON})"
if [[ $VIM_VERSION = "74" || $VIM_VERSION = "mercurial" ]]; then
if [[ $VIM_VERSION = "74" || $VIM_VERSION = "git" ]]; then
INTERFACE="--interface tmux"
VIM="${HOME}/bin/vim"
# This is needed so that vim finds the shared libraries it was build against -