On Fri, Nov 23, 2018 at 07:28:58PM +0200, Jason Gunthorpe wrote: > On Fri, Nov 23, 2018 at 07:21:26PM +0200, Leon Romanovsky wrote: > > From: Leon Romanovsky <leonro@xxxxxxxxxxxx> > > > > Default travis image is trusty which is Ubuntu 14.04, four years > > after this version is released, we will try to move to latest and > > shiny travis image - xenial, Ubuntu 16.04. > > > > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> > > --- > > PR to see my struggles :) > > https://github.com/linux-rdma/rdma-core/pull/433 > > --- > > .travis.yml | 3 +-- > > buildlib/cbuild | 8 ++++---- > > buildlib/travis-build | 6 +++--- > > 3 files changed, 8 insertions(+), 9 deletions(-) > > > > diff --git a/.travis.yml b/.travis.yml > > index 9794c1c7..c4ce0581 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -1,7 +1,6 @@ > > language: c > > # We don't support any distro earlier than trusty > ^^^^^^ > > Missed a spot > > Also this needs to change/go away: I left it intentionally, because we still can create DEB packages with cbuild on trusty and I was under impression that this comment is related to that and not to travis base. > > .travis.yml: - sourceline: "deb http://archive.ubuntu.com/ubuntu/ trusty multiverse" I'm updating PR now. > > > -sudo: required > > -dist: trusty > > +dist: xenial > > addons: > > # We run our builds sequentially in one VM rather than try and use the > > # matrix feature. This is because Travis is unreasonably inefficient > > diff --git a/buildlib/cbuild b/buildlib/cbuild > > index f9b5c2bd..c19e77eb 100755 > > --- a/buildlib/cbuild > > +++ b/buildlib/cbuild > > @@ -224,7 +224,7 @@ class travis(APTEnvironment): > > basically creating a container that is similar to what travis would > > use. Note this does not use the base travis image, nor does it install the > > typical travis packages.""" > > - docker_parent = "ubuntu:14.04"; > > + docker_parent = "ubuntu:16.04"; > > name = "travis"; > > is_deb = True; > > _yaml = None; > > @@ -280,12 +280,12 @@ class travis(APTEnvironment): > > def get_clang(self): > > """We are using the clang that comes in travis, which is not part of our base > > docker container, install something similar by hand.""" > > - llvm_tar = "clang+llvm-5.0.2-x86_64-linux-gnu-ubuntu-14.04.tar.xz" > > + llvm_tar = "clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz" > > cmds = [ > > - """RUN wget -q http://releases.llvm.org/5.0.2/{0} -O /tmp/{0} && \\ > > + """RUN wget -q http://releases.llvm.org/7.0.0/{0} -O /tmp/{0} && \\ > > tar xf /tmp/{0} -C /usr/local/ && \\ > > rm /tmp/{0} && \\ > > - (cd /usr/local/bin/ && ln -sf ../clang*/bin/clang-5.0 .)""".format(llvm_tar)]; > > + (cd /usr/local/bin/ && ln -sf ../clang*/bin/clang-7 .)""".format(llvm_tar)]; > > return cmds; > > I wonder if we can go back to using the apt.llvm.org version of > clang. We only stopped because it became broken.. I don't see any advantages of using APT. This specific hack worked and works now too. Thanks > > Jason
