Hi On Wed, Oct 21, 2020 at 7:58 AM David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> wrote: > > On Mon, Oct 12, 2020 at 11:34:05AM +0400, marcandre.lureau@xxxxxxxxxx wrote: > > From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > > --- > > .travis.yml | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/.travis.yml b/.travis.yml > > index a5163de..e2d74a4 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -6,6 +6,12 @@ env: > > # COVERITY_SCAN_TOKEN (dgibson/dtc) > > - secure: "vlHvXe618//IM9LQaKzqsrUbjs7ng0L9UCST4kJbJnFQDXvVe5JiSmJGd4ef7mm0NUv5bMRl2W3xCiu6BYAu/NvU3tMNHoLG+JgCJs0+wLJXbWOwji/NmH7olqgJG+CmpaCMXjARF6+nrTnBYHJL6cYyf4KVoV4B0I/hLUW91+s=" > > > > +before_install: > > + - '[ $TRAVIS_CPU_ARCH = amd64 ] && sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu xenial-backports main universe" || sudo add-apt-repository -y "deb http://ports.ubuntu.com xenial-backports main universe"' > > + - sudo apt-get -q update > > + - sudo apt-get -t xenial-backports install -y python3 python3-setuptools python3-pip ninja-build > > + - sudo pip3 install meson > > + > > matrix: > > include: > > - addons: > > @@ -25,12 +31,16 @@ matrix: > > script: > > - make > > - make check && make checkm > > + - meson build > > + - ninja -C build test > > I'd prefer that the meson builds be done as separate travis subjobs. > That way we can be confident that both the legacy-make and meson > builds work, without subtle requirements on having run the other one > first. > Tbh, I don't know how to do that. Each .travis-ci file I look at is so different, and testing them is a pain (push to git, check the webpage..). Any idea? > > > > # Check it builds properly without optional packages: > > # python, valgrind, libyaml > > - script: > > - make > > - make check > > + - meson build > > + - ninja -C build test > > > > - arch: arm64 > > addons: > > @@ -42,6 +52,8 @@ matrix: > > script: > > - make > > - make check checkm > > + - meson build > > + - ninja -C build test > > > > - arch: ppc64le > > addons: > > @@ -52,6 +64,8 @@ matrix: > > script: > > - make > > - make check > > + - meson build > > + - ninja -C build test > > > > - arch: s390x > > addons: > > @@ -63,3 +77,5 @@ matrix: > > script: > > - make > > - make check checkm > > + - meson build > > + - ninja -C build test > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson
