diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-12 18:30:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-12 18:30:39 +0100 |
| commit | b6be3ea45b3bb260d475ba63620252ce2963c560 (patch) | |
| tree | 69ee841cb153c06b33ac96f86445af34e9132e87 | |
| parent | 2b946c9f9b0e0fd805fb8f3e4c16e0a68ae13129 (diff) | |
patch 8.0.0080v8.0.0080
Problem: The OS X build fails on Travis.
Solution: Skip the virtual framebuffer on OS X.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e9464aec97..d4472f20be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,11 +69,9 @@ before_install: # Lua is not installed on Travis OSX - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi -# Start virtual framebuffer to be able to test the GUI. +# Start virtual framebuffer to be able to test the GUI. Does not work on OS X. before_script: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - - sleep 3 # give xvfb some time to start + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi script: - NPROC=$(getconf _NPROCESSORS_ONLN) diff --git a/src/version.c b/src/version.c index 88adc6d19b..d4b84c5ce1 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 80, +/**/ 79, /**/ 78, |