8:57 a.m.
They're all failing at the moment anyway.
We'll get the Ubuntu coverage back as soon as we add Ubuntu
builders to the CentOS CI environment.
Andrea Bolognani (3):
travis: Stop performing Ubuntu builds
travis: Remove matrix
travis: Minor style tweaks
.travis.yml | 118 ++++++++--------------------------------------------
1 file changed, 17 insertions(+), 101 deletions(-)
--
2.17.1
8:57 a.m.
New subject: [libvirt] [PATCH 1/3] travis: Stop performing Ubuntu builds
As of 60d9ad6f1e42, we require GnuTLS 3.2 to build libvirt;
the only Linux environment available on Travis CI (Ubuntu
14.04 LTS), however, ships with an older GnuTLS version and
thus the build cannot succeed.
Let's only perform macOS builds on Travis CI.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.travis.yml | 82 -----------------------------------------------------
1 file changed, 82 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c71411dcae..111d2c0927 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,6 @@ branches:
matrix:
include:
- - compiler: gcc
- dist: trusty
- env:
- - PYTHON=$(which python2)
- - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart"
- - compiler: clang
- dist: trusty
- env:
- - PYTHON=$(which python3)
- - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
- compiler: clang
os: osx
env:
@@ -33,75 +23,6 @@ matrix:
# some useful coverage
- make -j3 && make -j3 install && make -j3 dist
-addons:
- apt:
- # Please keep this list sorted alphabetically
- packages:
- - augeas-tools
- - autoconf
- - automake
- - autopoint
- - bash-completion
- - ccache
- - dnsmasq-base
- - dwarves
- - ebtables
- - gcc
- - gettext
- - glusterfs-client
- - libacl1-dev
- - libapparmor-dev
- - libattr1-dev
- - libaudit-dev
- - libavahi-client-dev
- - libblkid-dev
- - libc6-dev
- - libcap-ng-dev
- - libc-dev-bin
- - libcurl4-gnutls-dev
- - libdbus-1-dev
- - libdevmapper-dev
- - libfuse-dev
- - libgnutls-dev
- - libnetcf-dev
- - libnl-3-dev
- - libnl-route-3-dev
- - libnuma-dev
- - libopenwsman-dev
- - libparted-dev
- - libpcap-dev
- - libpciaccess-dev
- - librbd-dev
- - libreadline-dev
- - libsanlock-dev
- - libsasl2-dev
- - libselinux1-dev
- - libssh2-1-dev
- - libssh-dev
- - libtirpc-dev
- - libtool
- - libudev-dev
- - libxen-dev
- - libxml2-dev
- - libxml2-utils
- - libyajl-dev
- - lvm2
- - make
-# - nfs-common # broken on trusty since build #807 (2018-01-09)
- - open-iscsi
- - parted
- - patch
- - perl
- - pkgconf
- - policykit-1
- - qemu-utils
- - radvd
- - scrub
- - sheepdog
- - systemtap-sdt-dev
- - xsltproc
- - zfs-fuse
-
git:
submodules: true
@@ -112,9 +33,6 @@ env:
before_script:
- ./autogen.sh --prefix=$(pwd)/install-root
-script:
- - make -j3 && make -j3 syntax-check && make -j3 distcheck
DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS
-
after_failure:
- echo
'============================================================================'
- 'ver=$(sed -n "s/AC_INIT(\[libvirt\], \[\([0-9.]*\)\],.*/\1/p"
configure.ac);
--
2.17.1
8:57 a.m.
New subject: [libvirt] [PATCH 2/3] travis: Remove matrix
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(a)redhat.com>
---
.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
8:57 a.m.
New subject: [libvirt] [PATCH 3/3] travis: Minor style tweaks
Group related settings together and fix indentation.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.travis.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 91838e3651..a72a6c6c42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,15 @@
+os: osx
sudo: false
-language: c
-cache: ccache
-
-branches:
- except:
- - /^.*-maint$/
-os: osx
+language: c
compiler: clang
+cache: ccache
git:
submodules: true
+branches:
+ except:
+ - /^.*-maint$/
env:
global:
--
2.17.1
9:01 a.m.
On Tue, Jun 05, 2018 at 03:57:03PM +0200, Andrea Bolognani wrote:
They're all failing at the moment anyway.
We'll get the Ubuntu coverage back as soon as we add Ubuntu
builders to the CentOS CI environment.
I've got fixes testing for travis to make it use both 16.04 and 18.04
for builds. I'm just waiting for test builds to finish before posting,
so please drop this series.
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 :|
2397
days inactive
2397
days old
4 comments
2 participants
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé