diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-12 21:45:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-12 21:45:23 +0200 |
| commit | 8065cf2bfba93a8aeed29f591152edeb0841bff6 (patch) | |
| tree | cfc672c35b54844fc1fefd20d9c2080ee25bccfa | |
| parent | 4a6fcf8047de13c7949ab2f27f7774acaec4ae4d (diff) | |
patch 8.0.1187: building with lua fails for OSX on Travisv8.0.1187
Problem: Building with lua fails for OSX on Travis.
Solution: Separate brew-update and brew-install. (Ozaki Kiichi, closes #2203)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ab3de51792..b3ecd091c4 100644 --- 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 diff --git a/src/version.c b/src/version.c index 398a668ad1..f1ab8278a2 100644 --- 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, |