patch 8.2.0384: Travis CI has warnings

Problem:    Travis CI has warnings.
Solution:   Avoid warnings, clean up the config. (Ozaki Kiichi, closes #5779)
This commit is contained in:
Bram Moolenaar
2020-03-15 15:10:11 +01:00
parent 4f32f9c90e
commit 5e4d1eba95
2 changed files with 11 additions and 7 deletions

View File

@ -1,6 +1,6 @@
language: c language: c
anchors: _anchors:
envs: envs:
- &tiny-nogui - &tiny-nogui
BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
@ -85,6 +85,10 @@ anchors:
osx: &osx osx: &osx
os: osx os: osx
before_script:
- do_test() { "$@"; }
homebrew: &osx-homebrew
addons: addons:
homebrew: homebrew:
packages: packages:
@ -93,13 +97,11 @@ anchors:
cache: cache:
directories: directories:
- /usr/local/Homebrew/Library/Homebrew/vendor/ - /usr/local/Homebrew/Library/Homebrew/vendor/
- /usr/local/Homebrew/Library/Taps/ - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
before_install: before_install:
- rvm reset - rvm reset
# Lua is not installed on Travis OSX # Lua is not installed on Travis OSX
- export LUA_PREFIX=/usr/local - export LUA_PREFIX=/usr/local
before_script:
- do_test() { "$@"; }
coverage: &coverage coverage: &coverage
- ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8 - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
@ -111,8 +113,6 @@ anchors:
asan_symbolize < "${log}" asan_symbolize < "${log}"
done < <(find . -type f -name 'asan.*' -size +0) done < <(find . -type f -name 'asan.*' -size +0)
sudo: false
branches: branches:
except: except:
- /^v[0-9]/ - /^v[0-9]/
@ -155,7 +155,7 @@ script:
# exclude some builds on mac os x and linux # exclude some builds on mac os x and linux
# on mac os x "tiny" is always without GUI # on mac os x "tiny" is always without GUI
# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env # linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
matrix: jobs:
include: include:
- <<: *osx - <<: *osx
name: tiny-nogui/clang name: tiny-nogui/clang
@ -166,10 +166,12 @@ matrix:
compiler: gcc compiler: gcc
env: *tiny-nogui env: *tiny-nogui
- <<: *osx - <<: *osx
<<: *osx-homebrew
name: huge/clang name: huge/clang
compiler: clang compiler: clang
env: *osx-huge env: *osx-huge
- <<: *osx - <<: *osx
<<: *osx-homebrew
name: huge/gcc name: huge/gcc
compiler: gcc compiler: gcc
env: *osx-huge env: *osx-huge

View File

@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
384,
/**/ /**/
383, 383,
/**/ /**/