Now that we're only performing macOS builds on Travis CI,
we no longer need to maintain a matrix and can flatten the
configuration.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
.travis.yml | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 111d2c0927..91838e3651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,33 +6,32 @@ branches:
except:
- /^.*-maint$/
-matrix:
- include:
- - compiler: clang
- os: osx
- env:
- - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
- before_install:
- - brew uninstall python mercurial postgis sfcgal cgal gdal
- - brew update
- - brew upgrade
- - brew install python ccache rpcgen yajl
- script:
- # We can't run make distcheck/syntax-check because they
- # fail on macOS, but doing 'install' and 'dist' gives us
- # some useful coverage
- - make -j3 && make -j3 install && make -j3 dist
+os: osx
+compiler: clang
git:
submodules: true
env:
global:
+ - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
- VIR_TEST_DEBUG=1
+before_install:
+ - brew uninstall python mercurial postgis sfcgal cgal gdal
+ - brew update
+ - brew upgrade
+ - brew install python ccache rpcgen yajl
+
before_script:
- ./autogen.sh --prefix=$(pwd)/install-root
+script:
+ # We can't run make distcheck/syntax-check because they
+ # fail on macOS, but doing 'install' and 'dist' gives us
+ # some useful coverage
+ - make -j3 && make -j3 install && make -j3 dist
+
after_failure:
- echo '============================================================================'
- 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p" configure.ac);
--
2.17.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
