summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-15 15:10:11 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-15 15:10:11 +0100
commit5e4d1eba9579ea6b876ad699d77742e657505d35 (patch)
treed1155f0d03908223670110df21b5f60ffb12241e /.travis.yml
parent4f32f9c90e5710627467d74b415b3dc46fcc593a (diff)
downloadvim-git-5e4d1eba9579ea6b876ad699d77742e657505d35.tar.gz
patch 8.2.0384: Travis CI has warningsv8.2.0384
Problem: Travis CI has warnings. Solution: Avoid warnings, clean up the config. (Ozaki Kiichi, closes #5779)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 9 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 3f55cc90b..a4fc6dda2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: c
-anchors:
+_anchors:
envs:
- &tiny-nogui
BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
@@ -85,6 +85,10 @@ anchors:
osx: &osx
os: osx
+ before_script:
+ - do_test() { "$@"; }
+
+ homebrew: &osx-homebrew
addons:
homebrew:
packages:
@@ -93,13 +97,11 @@ anchors:
cache:
directories:
- /usr/local/Homebrew/Library/Homebrew/vendor/
- - /usr/local/Homebrew/Library/Taps/
+ - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
before_install:
- rvm reset
# Lua is not installed on Travis OSX
- export LUA_PREFIX=/usr/local
- before_script:
- - do_test() { "$@"; }
coverage: &coverage
- ~/.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}"
done < <(find . -type f -name 'asan.*' -size +0)
-sudo: false
-
branches:
except:
- /^v[0-9]/
@@ -155,7 +155,7 @@ script:
# exclude some builds on mac os x and linux
# on mac os x "tiny" is always without GUI
# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
-matrix:
+jobs:
include:
- <<: *osx
name: tiny-nogui/clang
@@ -166,10 +166,12 @@ matrix:
compiler: gcc
env: *tiny-nogui
- <<: *osx
+ <<: *osx-homebrew
name: huge/clang
compiler: clang
env: *osx-huge
- <<: *osx
+ <<: *osx-homebrew
name: huge/gcc
compiler: gcc
env: *osx-huge