Skip to content

Commit 6872314

Browse files
committed
Update travis to use clang 6
Signed-off-by: Ajmal Sharif <asharif10@bloomberg.net>
1 parent 6edd117 commit 6872314

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.travis.Dockerfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ FROM ubuntu:18.04
22

33
# Install build dependencies
44
RUN apt-get update && apt-get install -y \
5-
clang-5.0 \
6-
clang-format-5.0 \
7-
clang-tools-5.0 \
8-
clang-tidy-5.0 \
5+
clang-6.0 \
6+
clang-format-6.0 \
7+
clang-tools-6.0 \
8+
clang-tidy-6.0 \
99
cmake \
10-
libclang-5.0-dev \
10+
libclang-6.0-dev \
1111
libfile-spec-native-perl \
1212
libgtest-dev
1313

1414
# Set up clang compilers
15-
ENV CC=/usr/lib/llvm-5.0/bin/clang \
16-
CXX=/usr/lib/llvm-5.0/bin/clang++
15+
ENV CC=/usr/lib/llvm-6.0/bin/clang \
16+
CXX=/usr/lib/llvm-6.0/bin/clang++
1717

1818
# Fix issues with gtest installation from ubuntu debian
1919
RUN cd /usr/src/gtest && \
@@ -23,17 +23,17 @@ RUN cd /usr/src/gtest && \
2323

2424
# Fix issues with clang installation from ubuntu debian
2525
RUN mkdir -p /usr/lib/cmake && \
26-
ln -s /usr/share/llvm-5.0/cmake /usr/lib/cmake/clang && \
27-
for hdr in /usr/lib/llvm-5.0/include/clang/*; do \
26+
ln -s /usr/share/llvm-6.0/cmake /usr/lib/cmake/clang && \
27+
for hdr in /usr/lib/llvm-6.0/include/clang/*; do \
2828
ln -s $hdr /usr/include/clang/$(basename $hdr); \
2929
done && \
30-
ln -s /usr/lib/llvm-5.0/include/clang-c /usr/include/clang-c && \
31-
ln -s /usr/lib/llvm-5.0/include/llvm /usr/include/llvm && \
32-
ln -s /usr/lib/llvm-5.0/include/llvm-c /usr/include/llvm-c && \
33-
for lib in /usr/lib/llvm-5.0/lib/*; do \
30+
ln -s /usr/lib/llvm-6.0/include/clang-c /usr/include/clang-c && \
31+
ln -s /usr/lib/llvm-6.0/include/llvm /usr/include/llvm && \
32+
ln -s /usr/lib/llvm-6.0/include/llvm-c /usr/include/llvm-c && \
33+
for lib in /usr/lib/llvm-6.0/lib/*; do \
3434
ln -s $lib /usr/lib/$(basename $lib); \
3535
done && \
36-
for bin in /usr/bin/*-5.0; do \
36+
for bin in /usr/bin/*-6.0; do \
3737
ln -s $bin /usr/bin/$(basename $bin | rev | cut -d '-' -f2- | rev); \
3838
done
3939

@@ -42,18 +42,18 @@ WORKDIR clangmetatool
4242

4343
# Build tool, run tests, and do a test install
4444
RUN mkdir build && cd build && \
45-
cmake -DClang_DIR=/usr/share/llvm-5.0/cmake .. && \
45+
cmake -DClang_DIR=/usr/share/llvm-6.0/cmake .. && \
4646
make all test && \
4747
make install && \
4848
cd .. && rm -rf build
4949

5050
# Fix includes for clangmetatool (due to ubuntu debian's clang)
51-
RUN ln -s /usr/lib/llvm-5.0/include/clangmetatool /usr/include/clangmetatool
51+
RUN ln -s /usr/lib/llvm-6.0/include/clangmetatool /usr/include/clangmetatool
5252

5353
# Build skeleton
5454
RUN mkdir skeleton/build && cd skeleton/build && \
55-
cmake -DClang_DIR=/usr/share/llvm-5.0/cmake \
56-
-Dclangmetatool_DIR=/usr/share/llvm-5.0/cmake .. && \
55+
cmake -DClang_DIR=/usr/share/llvm-6.0/cmake \
56+
-Dclangmetatool_DIR=/usr/share/llvm-6.0/cmake .. && \
5757
make all && \
5858
make install && \
5959
cd - && rm -rf skeleton/build

0 commit comments

Comments
 (0)