Skip to content

fix: neovim vroom tests #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 1, 2020
Merged

fix: neovim vroom tests #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2244de
fix: neovim vroom tests
agriffis Dec 30, 2019
55ea1fa
doc: add comment about minimum maktaba version
agriffis Dec 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: generic
env:
global:
- VROOM_VERSION=0.13.0
matrix:
# This Maktaba version should match the minimum required in instant/flags.vim.
- CI_TARGET=vim MAKTABA_VERSION=1.10.0
- CI_TARGET=vim MAKTABA_VERSION=1.12.0
- CI_TARGET=vim MAKTABA_VERSION=master
- CI_TARGET=neovim MAKTABA_VERSION=1.12.0
- CI_TARGET=neovim MAKTABA_VERSION=master
before_script:
- sudo apt-get update
Expand All @@ -13,11 +16,11 @@ before_script:
elif [ $CI_TARGET = neovim ]; then
eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64" &&
wget https://bootstrap.pypa.io/get-pip.py &&
sudo python3 get-pip.py --allow-external sudo &&
sudo python3 get-pip.py &&
sudo pip3 install neovim;
fi
- wget https://github.com/google/vroom/releases/download/v0.12.0/vroom_0.12.0-1_all.deb
- sudo dpkg -i ./vroom_0.12.0-1_all.deb
- wget https://github.com/google/vroom/releases/download/v${VROOM_VERSION}/vroom_${VROOM_VERSION}-1_all.deb
- sudo dpkg -i ./vroom_${VROOM_VERSION}-1_all.deb
- git clone -b ${MAKTABA_VERSION} https://github.com/google/vim-maktaba.git ../maktaba/
- git clone https://github.com/google/vim-glaive.git ../glaive/
services:
Expand All @@ -27,5 +30,3 @@ script:
- vroom $VROOM_ARGS --crawl ./vroom/
matrix:
fast_finish: true
allow_failures:
- env: CI_TARGET=neovim MAKTABA_VERSION=master
7 changes: 5 additions & 2 deletions instant/flags.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ endif


" Shout if maktaba is too old. Done here to ensure it's always triggered.
if !maktaba#IsAtLeastVersion('1.10.0')
call maktaba#error#Shout('Codefmt requires maktaba version 1.10.0.')
" We need at least 1.12.0 so that maktaba#ensure#IsCallable works on Neovim and
" recent Vim (newer than is actually in Travis/Xenial).
" See https://github.com/google/vim-maktaba/issues/173
if !maktaba#IsAtLeastVersion('1.12.0')
call maktaba#error#Shout('Codefmt requires maktaba version 1.12.0.')
call maktaba#error#Shout('You have maktaba version %s.', maktaba#VERSION)
call maktaba#error#Shout('Please update your maktaba install.')
endif
Expand Down
3 changes: 3 additions & 0 deletions vroom/setupvroom.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
" Codefmt does not support compatible mode.
set nocompatible

" Set cmdheight to avoid "Hit ENTER to continue" without needing :silent
set cmdheight=10

" Install the codefmt plugin.
let s:repo = expand('<sfile>:p:h:h')
execute 'source' s:repo . '/bootstrap.vim'
Expand Down