summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-28 22:59:36 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-28 22:59:36 +0100
commit2339fa335fcce46226f871b2c95c433966c711e9 (patch)
tree9a0baf9de208b6bdb494598e7988e960eec4d68b /.travis.yml
parent12dfc9eef14fe74c46145aa9e6cba9666f1bcd40 (diff)
downloadvim-git-2339fa335fcce46226f871b2c95c433966c711e9.tar.gz
patch 8.1.0841: travis config to get Lua on MacOS is too complicatedv8.1.0841
Problem: Travis config to get Lua on MacOS is too complicated. Solution: Use an addons entry. (Ozaki Kiichi, closes 3876)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index cf95cd667..277e6feb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,10 @@ addons:
- tcl-dev
- cscope
- libgtk2.0-dev
+ homebrew:
+ packages:
+ - lua
+ update: true
before_install:
- rvm reset
@@ -93,7 +97,7 @@ before_install:
# building cffi only works with gcc, not with clang
- if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
# Lua is not installed on Travis OSX
- - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export HOMEBREW_NO_AUTO_UPDATE=1; brew update; brew install lua; export LUA_PREFIX=/usr/local; fi
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LUA_PREFIX=/usr/local; fi
# Use llvm-cov instead of gcov when compiler is clang.
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then ln -sf $(which llvm-cov) /home/travis/bin/gcov; fi