From 53ba5cbf995f73500a6ca35a1a55e04e1402fe4a Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 18 Oct 2018 14:48:00 +0900 Subject: [PATCH] Bump system LLVM version for travis builds to 7 --- .travis.yml | 2 +- .../{x86_64-gnu-llvm-5.0 => x86_64-gnu-llvm-7}/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) rename src/ci/docker/{x86_64-gnu-llvm-5.0 => x86_64-gnu-llvm-7}/Dockerfile (61%) diff --git a/.travis.yml b/.travis.yml index ec8060b9f56aa..0807488fcca82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: fast_finish: true include: # Images used in testing PR and try-build should be run first. - - env: IMAGE=x86_64-gnu-llvm-5.0 RUST_BACKTRACE=1 + - env: IMAGE=x86_64-gnu-llvm-7 RUST_BACKTRACE=1 if: type = pull_request OR branch = auto - env: IMAGE=dist-x86_64-linux DEPLOY=1 diff --git a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile similarity index 61% rename from src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile rename to src/ci/docker/x86_64-gnu-llvm-7/Dockerfile index 4f90c5097260c..f5fa933637c39 100644 --- a/src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile @@ -11,17 +11,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-5.0-tools \ libedit-dev \ zlib1g-dev \ xz-utils +RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ + echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main > /etc/apt/sources.list.d/llvm.list && \ + apt-get update && apt-get install -y --no-install-recommends llvm-7-tools + COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh # using llvm-link-shared due to libffi issues -- see #34486 ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ - --llvm-root=/usr/lib/llvm-5.0 \ + --llvm-root=/usr/lib/llvm-7 \ --enable-llvm-link-shared ENV RUST_CHECK_TARGET check