changeset 15667:e093e8809467 v8.1.0841

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 <Bram@vim.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 28 Jan 2019 23:00:06 +0100
parents 0591140b84b2
children 125147ceb8d5
files .travis.yml src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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,