diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-07 20:34:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 20:34:16 +0100 |
| commit | ccdbcfea0b74b5e3c8ce391a173165de1c72c612 (patch) | |
| tree | cf795048aaa4ad51173ef605db5e7b8218f04a1e | |
| parent | 8c2cb81d7ecb05f5c399696798690e1861c3b96a (diff) | |
| parent | 46a9600d0e17f460a940ac6ed605f01f5b12aaf2 (diff) | |
| download | rneovim-ccdbcfea0b74b5e3c8ce391a173165de1c72c612.tar.gz rneovim-ccdbcfea0b74b5e3c8ce391a173165de1c72c612.tar.bz2 rneovim-ccdbcfea0b74b5e3c8ce391a173165de1c72c612.zip | |
Merge #7820 'ci/travis/macOS: skip ruby gem install'
| -rw-r--r-- | ci/common/build.sh | 9 | ||||
| -rwxr-xr-x | ci/install.sh | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index f398a1a1cc..adfd7b9e8a 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -87,3 +87,12 @@ build_nvim() { cd "${TRAVIS_BUILD_DIR}" } + +macos_rvm_dance() { + # neovim-ruby gem requires a ruby newer than the macOS default. + source ~/.rvm/scripts/rvm + rvm get stable --auto-dotfiles + rvm reload + rvm use 2.2.5 + rvm use +} diff --git a/ci/install.sh b/ci/install.sh index 2fe4f88822..f51ba1a776 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -21,8 +21,10 @@ echo "Install neovim module for Python 3." # https://github.com/travis-ci/travis-ci/issues/8363 CC=cc pip3 -q install --user --upgrade neovim || true -echo "Install neovim RubyGem." -gem install --no-document --version ">= 0.2.0" neovim +if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then + echo "Install neovim RubyGem." + gem install --no-document --version ">= 0.2.0" neovim +fi if [[ "${TRAVIS_OS_NAME}" == linux ]]; then echo "Install neovim npm package" |