Mercurial > vim

changeset 10700:09fa2d7dc055 v8.0.0240

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0240: failure with one build on CI commit https://github.com/vim/vim/commit/4f7090b93d9b2c2e1724466a2e069e97a5e91808 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Thu, 26 Jan 2017 21:30:05 +0100
parents e9d0ab4df68a
children fe97b963559c
files .travis.yml src/version.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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,