diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-26 21:24:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-26 21:24:02 +0100 |
| commit | 4f7090b93d9b2c2e1724466a2e069e97a5e91808 (patch) | |
| tree | dec43942890db91c39a1b1a4d32cb9f8c4fb9060 | |
| parent | 1e07633a5d42f1756da88c25c3e7df957470acd9 (diff) | |
| download | vim-git-4f7090b93d9b2c2e1724466a2e069e97a5e91808.tar.gz | |
patch 8.0.0240: failure with one build on CIv8.0.0240
Problem: The clang build on CI fails with one configuration.
Solution: Redo a previous patch that was accidentally reverted.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 73aac5a5d..44e320c27 100644 --- 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 index 36dbe3a54..4e4161719 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 */ /**/ + 240, +/**/ 239, /**/ 238, |