# HG changeset patch # User Christian Brabandt # Date 1485462605 -3600 # Node ID 09fa2d7dc055cf10412b457db3714910c6e49393 # Parent e9d0ab4df68a0781633e7466f669e6dec6c76058 patch 8.0.0240: failure with one build on CI commit https://github.com/vim/vim/commit/4f7090b93d9b2c2e1724466a2e069e97a5e91808 Author: Bram Moolenaar Date: Thu Jan 26 21:24:02 2017 +0100 patch 8.0.0240: failure with one build on CI Problem: The clang build on CI fails with one configuration. Solution: Redo a previous patch that was accidentally reverted. diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,10 @@ addons: - cscope before_install: - - pip install --user cpp-coveralls - - pip install --user requests[security] + - if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi + # needed for https support for coveralls + # 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 diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 240, +/**/ 239, /**/ 238,