changeset 12618:53ee2223fb0a v8.0.1187

patch 8.0.1187: building with lua fails for OSX on Travis commit https://github.com/vim/vim/commit/8065cf2bfba93a8aeed29f591152edeb0841bff6 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 12 21:45:23 2017 +0200 patch 8.0.1187: building with lua fails for OSX on Travis Problem: Building with lua fails for OSX on Travis. Solution: Separate brew-update and brew-install. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/2203)
author Christian Brabandt <cb@256bit.org>
date Thu, 12 Oct 2017 22:00:04 +0200
parents 082ee475abad
children f3ce25ab33e3
files .travis.yml src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,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 brew install lua; export LUA_PREFIX=/usr/local; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export HOMEBREW_NO_AUTO_UPDATE=1; brew update; brew install lua; 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
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1187,
+/**/
     1186,
 /**/
     1185,