Skip to content

Commit

Permalink
change mercurial to git
Browse files Browse the repository at this point in the history
  • Loading branch information
seletskiy committed Sep 7, 2016
1 parent 8d77e89 commit 7549874
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -6,15 +6,15 @@ python:
- 3.4
env:
- VIM_VERSION="74"
- VIM_VERSION="mercurial"
- VIM_VERSION="git"
# - VIM_VERSION="NEOVIM"

install:
# Some of these commands fail transiently. We keep retrying them until they succeed.
- 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:
Expand Down
6 changes: 3 additions & 3 deletions travis_install.sh
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion travis_test.sh
Expand Up @@ -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 -
Expand Down

2 comments on commit 7549874

@blueyed
Copy link
Contributor

@blueyed blueyed commented on 7549874 Sep 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw: you might be interested in https://github.com/tweekmonster/vim-testbed.

@seletskiy
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blueyed: Thx. I do have my own framework for testing vim plugins without docker: https://github.com/reconquest/vim-test.bash

Anyway, it's UltiSnips is not mine project, so it's legacy code for me.

Please sign in to comment.