-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from jreybert/next
Ready to release 1.2
- Loading branch information
Showing
21 changed files
with
826 additions
and
253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,70 @@ | ||
language: vim | ||
|
||
sudo: false | ||
branches: | ||
only: | ||
- master | ||
- next | ||
|
||
os: | ||
- linux | ||
- osx | ||
|
||
env: | ||
matrix: | ||
- TEST_SUB_PATH=./ | ||
- TEST_SUB_PATH=books/templates/ | ||
- VIM_VERSION=normal | ||
- VIM_VERSION=last | ||
- VIM_VERSION=neovim | ||
- VIM_VERSION=macvim | ||
|
||
matrix: | ||
allow_failures: | ||
exclude: | ||
- os: osx | ||
env: VIM_VERSION=last | ||
# neovim build fails with homebrew | ||
# Error: undefined method `desc' for Neovim:Class | ||
- os: osx | ||
env: VIM_VERSION=neovim | ||
- os: linux | ||
env: VIM_VERSION=macvim | ||
|
||
install: | ||
- if [ "$TRAVIS_OS_NAME" = 'osx' ]; then | ||
if [ "$VIM_VERSION" = 'neovim' ]; then | ||
brew tap neovim/neovim && | ||
brew tap --repair && | ||
brew install --HEAD neovim; | ||
elif [ "$VIM_VERSION" = 'macvim' ]; then | ||
brew install macvim; | ||
elif [ "$VIM_VERSION" = 'normal' ]; then | ||
echo "use normal vim"; | ||
else | ||
echo "VIM_VERSION is not set"; | ||
exit 1; | ||
fi | ||
elif [ "$TRAVIS_OS_NAME" = 'linux' ]; then | ||
if [ "$VIM_VERSION" = 'last' ]; then | ||
sudo add-apt-repository -y ppa:fcwu-tw/ppa && | ||
sudo apt-get -qq update && | ||
sudo apt-get -qq -f install && | ||
sudo apt-get -qq install vim; | ||
elif [ "$VIM_VERSION" = 'neovim' ]; then | ||
sudo add-apt-repository -y ppa:neovim-ppa/unstable && | ||
sudo apt-get -qq update && | ||
sudo apt-get -qq -f install && | ||
sudo apt-get -qq install neovim; | ||
elif [ "$VIM_VERSION" = 'normal' ]; then | ||
echo "use normal vim"; | ||
else | ||
echo "VIM_VERSION is not set"; | ||
exit 1; | ||
fi | ||
fi | ||
|
||
before_script: | ||
- git clone https://github.com/jreybert/djooks | ||
- git clone https://github.com/junegunn/vader.vim | ||
|
||
script: | ||
- ./test/run.sh . vader.vim djooks | ||
|
||
install: true | ||
- ./test/run.sh . vader.vim djooks $VIM_VERSION | ||
|
||
after_success: | ||
- ./test/merge.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.