thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 10:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

100% lld-11 for clang-11 builds

Browse Source
This commit is contained in:
alesapin 2020-09-24 19:26:04 +03:00
parent 5f9ef1ebbf
commit 646e843105
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/packager/binary/Dockerfile
View File

@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-binary-builder .
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=10
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
RUN apt-get update \
&& apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
@ -32,10 +32,6 @@ RUN apt-get update \
curl \
gcc-9 \
g++-9 \
llvm-${LLVM_VERSION} \
clang-${LLVM_VERSION} \
lld-${LLVM_VERSION} \
clang-tidy-${LLVM_VERSION} \
clang-11 \
clang-tidy-11 \
lld-11 \

13
docker/packager/deb/Dockerfile
View File

@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-deb-builder .
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=10
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
RUN apt-get update \
&& apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
@ -49,15 +49,6 @@ RUN apt-get update \
lld-11 \
llvm-11 \
llvm-11-dev \
clang-${LLVM_VERSION} \
clang-tidy-${LLVM_VERSION} \
lld-${LLVM_VERSION} \
llvm-${LLVM_VERSION} \
llvm-${LLVM_VERSION}-dev \
llvm-9-dev \
lld-9 \
clang-9 \
clang-tidy-9 \
ninja-build \
perl \
pkg-config \
@ -84,7 +75,7 @@ RUN apt-get update \
RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
# This symlink required by gcc to find lld compiler
RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
RUN ln -s /usr/bin/lld-11 /usr/bin/ld.lld
COPY build.sh /

6
tests/ci/ci_config.json
View File

@ -12,7 +12,7 @@
"with_coverage": false
},
{
"compiler": "gcc-10",
"compiler": "clang-11",
"build-type": "",
"sanitizer": "",
"package-type": "performance",
@ -72,7 +72,7 @@
"with_coverage": false
},
{
"compiler": "clang-10",
"compiler": "clang-11",
"build-type": "",
"sanitizer": "",
"package-type": "deb",
@ -102,7 +102,7 @@
"with_coverage": false
},
{
"compiler": "clang-10",
"compiler": "clang-11",
"build-type": "",
"sanitizer": "",
"package-type": "binary",