Skip to content

Commit 2339fa3

Browse files
committed
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)
1 parent 12dfc9e commit 2339fa3

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ addons:
8282
- tcl-dev
8383
- cscope
8484
- libgtk2.0-dev
85+
homebrew:
86+
packages:
87+
- lua
88+
update: true
8589

8690
before_install:
8791
- rvm reset
@@ -93,7 +97,7 @@ before_install:
9397
# building cffi only works with gcc, not with clang
9498
- if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
9599
# Lua is not installed on Travis OSX
96-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export HOMEBREW_NO_AUTO_UPDATE=1; brew update; brew install lua; export LUA_PREFIX=/usr/local; fi
100+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export LUA_PREFIX=/usr/local; fi
97101
# Use llvm-cov instead of gcov when compiler is clang.
98102
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then ln -sf $(which llvm-cov) /home/travis/bin/gcov; fi
99103

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,8 @@ static char *(features[]) =
783783

784784
static int included_patches[] =
785785
{ /* Add new patch number below this line */
786+
/**/
787+
841,
786788
/**/
787789
840,
788790
/**/

0 commit comments

Comments
 (0)