On Thu, Sep 14, 2017 at 03:09:06PM +0200, Andrea Bolognani wrote:
The default distribution is apparently ignored if an explicit test
matrix is provided, so we haven't actually been testing the precise
plus gcc combo.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.travis.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e93fc73b2..154727fa3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
sudo: false
language: c
-dist: precise
-compiler:
- - gcc
cache: ccache
addons:
apt:
@@ -82,15 +79,16 @@ script:
- if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 syntax-check;
fi
- if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 check; fi
-# Environments here are run in addition to the main environment defined above
That'll teach me to cut+paste from QEMU without checking reality :-)
matrix:
include:
+ - compiler: gcc
+ dist: precise
+ - compiler: gcc
+ dist: trusty
- compiler: clang
dist: precise
- compiler: clang
dist: trusty
- - compiler: gcc
- dist: trusty
- compiler: clang
os: osx
Reviewed-by: Daniel P. Berrange <berrange(a)redhat.com>
Regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|