Mercurial > vim

changeset 10371:2579df47c3b6 v8.0.0080

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/b6be3ea45b3bb260d475ba63620252ce2963c560 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 12 18:30:39 2016 +0100 patch 8.0.0080 Problem: The OS X build fails on Travis. Solution: Skip the virtual framebuffer on OS X.
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Nov 2016 18:45:04 +0100
parents ef4dc4869f7a
children f99b48e4cb62
files .travis.yml src/version.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,