Skip to content

Commit b6be3ea

Browse files
committed
patch 8.0.0080
Problem: The OS X build fails on Travis. Solution: Skip the virtual framebuffer on OS X.
1 parent 2b946c9 commit b6be3ea

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ before_install:
6969
# Lua is not installed on Travis OSX
7070
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
7171

72-
# Start virtual framebuffer to be able to test the GUI.
72+
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
7373
before_script:
74-
- "export DISPLAY=:99.0"
75-
- "sh -e /etc/init.d/xvfb start"
76-
- sleep 3 # give xvfb some time to start
74+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi
7775

7876
script:
7977
- NPROC=$(getconf _NPROCESSORS_ONLN)

src/version.c

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

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
80,
767769
/**/
768770
79,
769771
/**/

0 commit comments

Comments
 (0)