Merge pull request #10384 from ClickHouse/clang-10-ci

Use clang-10 in CI
This commit is contained in:
alexey-milovidov 2020-04-21 02:27:52 +03:00 committed by GitHub
commit d94fc26315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 8 deletions

View File

@ -1,5 +1,9 @@
FROM ubuntu:19.10
RUN apt-get --allow-unauthenticated update -y && apt-get install --yes wget gnupg
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN echo "deb [trusted=yes] http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main" >> /etc/apt/sources.list
RUN apt-get update -y \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get install --yes --no-install-recommends \
@ -19,10 +23,10 @@ RUN apt-get update -y \
python-termcolor \
sudo \
tzdata \
clang \
clang-tidy \
lld \
lldb
clang-10 \
clang-tidy-10 \
lld-10 \
lldb-10
COPY build.sh /

View File

@ -2,6 +2,10 @@
# docker build -t yandex/clickhouse-binary-builder .
FROM ubuntu:19.10
RUN apt-get --allow-unauthenticated update -y && apt-get install --yes wget gnupg
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN echo "deb [trusted=yes] http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main" >> /etc/apt/sources.list
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get --allow-unauthenticated install --yes --no-install-recommends \
@ -23,6 +27,9 @@ RUN apt-get update -y \
curl \
gcc-9 \
g++-9 \
clang-10 \
lld-10 \
clang-tidy-10 \
clang-9 \
lld-9 \
clang-tidy-9 \
@ -43,10 +50,10 @@ RUN apt-get update -y \
build-essential
# This symlink required by gcc to find lld compiler
RUN ln -s /usr/bin/lld-9 /usr/bin/ld.lld
RUN ln -s /usr/bin/lld-10 /usr/bin/ld.lld
ENV CC=clang-9
ENV CXX=clang++-9
ENV CC=clang-10
ENV CXX=clang++-10
# libtapi is required to support .tbh format from recent MacOS SDKs
RUN git clone https://github.com/tpoechtrager/apple-libtapi.git

View File

@ -1,6 +1,10 @@
# docker build -t yandex/clickhouse-deb-builder .
FROM ubuntu:19.10
RUN apt-get --allow-unauthenticated update -y && apt-get install --yes wget gnupg
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN echo "deb [trusted=yes] http://apt.llvm.org/eoan/ llvm-toolchain-eoan-10 main" >> /etc/apt/sources.list
RUN apt-get --allow-unauthenticated update -y \
&& env DEBIAN_FRONTEND=noninteractive \
apt-get --allow-unauthenticated install --yes --no-install-recommends \
@ -19,6 +23,9 @@ RUN apt-get --allow-unauthenticated update -y \
apt-get --allow-unauthenticated install --yes --no-install-recommends \
gcc-9 \
g++-9 \
clang-10 \
lld-10 \
clang-tidy-10 \
clang-9 \
lld-9 \
clang-tidy-9 \
@ -69,7 +76,7 @@ RUN chmod +x dpkg-deb
RUN cp dpkg-deb /usr/bin
# This symlink required by gcc to find lld compiler
RUN ln -s /usr/bin/lld-9 /usr/bin/ld.lld
RUN ln -s /usr/bin/lld-10 /usr/bin/ld.lld
COPY build.sh /