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 -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; def get_docker_file(self): diff --git a/buildlib/travis-build b/buildlib/travis-build index 0278ce76..7e0f2fba 100755 --- a/buildlib/travis-build +++ b/buildlib/travis-build @@ -9,9 +9,9 @@ mkdir build-travis build32 build-sparse build-aarch64 # Build with latest clang first cd build-travis -CC=clang-5.0 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 +CC=clang-7 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 ninja -../buildlib/check-build --src .. --cc clang-5.0 +../buildlib/check-build --src .. --cc clang-7 # 32 bit build to check format strings/etc cd ../build32 @@ -42,7 +42,7 @@ cd ../build-travis cp ../util/udma_barrier.h ../util/udma_barrier.h.old echo "#error Fail" >> ../util/udma_barrier.h rm CMakeCache.txt -CC=clang-5.0 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both +CC=clang-7 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both ninja cp ../util/udma_barrier.h.old ../util/udma_barrier.h -- 2.19.1
