diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-27 19:27:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-27 19:27:36 +0100 |
commit | e1876c7ad1b5e30c0a9919e2c4587d11550c8507 (patch) | |
tree | f44df6f6cccfce940c56b48acec41908f76ccfb6 | |
parent | 9ac1e2db79e3a1d86ce9cf7c6ea9181126556fb9 (diff) | |
parent | a9b1937e5afc8b418f60621749fb00875bc645dc (diff) | |
download | rneovim-e1876c7ad1b5e30c0a9919e2c4587d11550c8507.tar.gz rneovim-e1876c7ad1b5e30c0a9919e2c4587d11550c8507.tar.bz2 rneovim-e1876c7ad1b5e30c0a9919e2c4587d11550c8507.zip |
Merge pull request #9398 from janlazo/mac-brew-addon
-rw-r--r-- | .travis.yml | 5 | ||||
-rwxr-xr-x | ci/before_install.sh | 4 | ||||
-rwxr-xr-x | ci/install.sh | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 5514b1298a..93caf9ef75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,6 +117,11 @@ addons: - unzip - valgrind - xclip + homebrew: + update: true + packages: + - ccache + - ninja branches: only: diff --git a/ci/before_install.sh b/ci/before_install.sh index 86dd78af48..d8cf38d314 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -7,10 +7,6 @@ if [[ "${CI_TARGET}" == lint ]]; then exit fi -if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - >/dev/null brew update -fi - echo 'python info:' ( 2>&1 python --version || true diff --git a/ci/install.sh b/ci/install.sh index 7efbaf33b5..12985098cd 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,8 +8,6 @@ if [[ "${CI_TARGET}" == lint ]]; then fi if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - brew install ccache - brew install ninja export PATH="/usr/local/opt/ccache/libexec:$PATH" fi @@ -24,11 +22,11 @@ if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then # Use default CC to avoid compilation problems when installing Python modules. echo "Install neovim module for Python 2." CC=cc python2.7 -m pip -q install --user --upgrade neovim - - echo "Install neovim RubyGem." - gem install --no-document --version ">= 0.2.0" neovim fi +echo "Install neovim RubyGem." +gem install --no-document --version ">= 0.8.0" neovim + echo "Install neovim npm package" npm install -g neovim npm link neovim |