Skip to content

Commit 53ba5cb

Browse files
committed
Bump system LLVM version for travis builds to 7
1 parent f7eb7fb commit 53ba5cb

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ matrix:
1616
fast_finish: true
1717
include:
1818
# Images used in testing PR and try-build should be run first.
19-
- env: IMAGE=x86_64-gnu-llvm-5.0 RUST_BACKTRACE=1
19+
- env: IMAGE=x86_64-gnu-llvm-7 RUST_BACKTRACE=1
2020
if: type = pull_request OR branch = auto
2121

2222
- env: IMAGE=dist-x86_64-linux DEPLOY=1

src/ci/docker/x86_64-gnu-llvm-5.0/Dockerfile src/ci/docker/x86_64-gnu-llvm-7/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14-
llvm-5.0-tools \
1514
libedit-dev \
1615
zlib1g-dev \
1716
xz-utils
1817

18+
RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
19+
echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main > /etc/apt/sources.list.d/llvm.list && \
20+
apt-get update && apt-get install -y --no-install-recommends llvm-7-tools
21+
1922
COPY scripts/sccache.sh /scripts/
2023
RUN sh /scripts/sccache.sh
2124

2225
# using llvm-link-shared due to libffi issues -- see #34486
2326
ENV RUST_CONFIGURE_ARGS \
2427
--build=x86_64-unknown-linux-gnu \
25-
--llvm-root=/usr/lib/llvm-5.0 \
28+
--llvm-root=/usr/lib/llvm-7 \
2629
--enable-llvm-link-shared
2730
ENV RUST_CHECK_TARGET check

0 commit comments

Comments
 (0)