diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-28 22:59:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-28 22:59:36 +0100 |
| commit | 2339fa335fcce46226f871b2c95c433966c711e9 (patch) | |
| tree | 9a0baf9de208b6bdb494598e7988e960eec4d68b | |
| parent | 12dfc9eef14fe74c46145aa9e6cba9666f1bcd40 (diff) | |
| download | vim-git-8.1.0841.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)
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 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 diff --git a/src/version.c b/src/version.c index ae28d083d..a90d52e66 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 841, +/**/ 840, /**/ 839, |