From face35521a6db9c8f214341f564b87c5be11693f Mon Sep 17 00:00:00 2001 From: alesapin Date: Thu, 21 Mar 2019 11:02:45 +0300 Subject: [PATCH] Add clang-8 build --- docker/packager/binary/Dockerfile | 5 +++++ docker/packager/deb/Dockerfile | 5 +++++ docker/packager/packager | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 89c224504ea..25a6c844cd2 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:18.04 RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list +RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN apt-get update -y \ && env DEBIAN_FRONTEND=noninteractive \ @@ -23,6 +24,10 @@ RUN apt-get update -y \ lld-7 \ libclang-7-dev \ liblld-7-dev \ + clang-8 \ + lld-8 \ + libclang-8-dev \ + liblld-8-dev \ libicu-dev \ libreadline-dev \ ninja-build \ diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile index babc2f0b3a3..6a7f7325122 100644 --- a/docker/packager/deb/Dockerfile +++ b/docker/packager/deb/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:18.04 RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main" >> /etc/apt/sources.list +RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" >> /etc/apt/sources.list RUN apt-get --allow-unauthenticated update -y \ && env DEBIAN_FRONTEND=noninteractive \ @@ -24,6 +25,10 @@ RUN apt-get --allow-unauthenticated update -y \ lld-7 \ libclang-7-dev \ liblld-7-dev \ + clang-8 \ + lld-8 \ + libclang-8-dev \ + liblld-8-dev \ libicu-dev \ libreadline-dev \ ninja-build \ diff --git a/docker/packager/packager b/docker/packager/packager index 88fcc870cc9..8363de58609 100755 --- a/docker/packager/packager +++ b/docker/packager/packager @@ -146,7 +146,7 @@ if __name__ == "__main__": parser.add_argument("--clickhouse-repo-path", default="../../") parser.add_argument("--output-dir", required=True) parser.add_argument("--build-type", choices=("debug", ""), default="") - parser.add_argument("--compiler", choices=("clang-6.0", "clang-7", "gcc-7", "gcc-8"), default="gcc-7") + parser.add_argument("--compiler", choices=("clang-6.0", "clang-7", "gcc-7", "clang-8", "gcc-8"), default="gcc-7") parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="") parser.add_argument("--unbundled", action="store_true") parser.add_argument("--split-binary", action="store_true")