# HG changeset patch # User Bram Moolenaar # Date 1548712806 -3600 # Node ID e093e880946772aead7395f2a92aa63d1071a7ec # Parent 0591140b84b256addcdaee17aa4c064f174611e8 patch 8.1.0841: travis config to get Lua on MacOS is too complicated commit https://github.com/vim/vim/commit/2339fa335fcce46226f871b2c95c433966c711e9 Author: Bram Moolenaar Date: Mon Jan 28 22:59:36 2019 +0100 patch 8.1.0841: travis config to get Lua on MacOS is too complicated Problem: Travis config to get Lua on MacOS is too complicated. Solution: Use an addons entry. (Ozaki Kiichi, closes 3876) diff --git a/.travis.yml b/.travis.yml --- 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 --- 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,