diff --git a/docker/packager/README.md b/docker/packager/README.md index 9fbc2d7f8b5..a745f6225fa 100644 --- a/docker/packager/README.md +++ b/docker/packager/README.md @@ -3,10 +3,10 @@ compilers and build settings. Correctly configured Docker daemon is single depen Usage: -Build deb package with `gcc-9` in `debug` mode: +Build deb package with `clang-11` in `debug` mode: ``` $ mkdir deb/test_output -$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=gcc-9 --build-type=debug +$ ./packager --output-dir deb/test_output/ --package-type deb --compiler=clang-11 --build-type=debug $ ls -l deb/test_output -rw-r--r-- 1 root root 3730 clickhouse-client_18.14.2+debug_all.deb -rw-r--r-- 1 root root 84221888 clickhouse-common-static_18.14.2+debug_amd64.deb @@ -18,11 +18,11 @@ $ ls -l deb/test_output ``` -Build ClickHouse binary with `clang-10` and `address` sanitizer in `relwithdebuginfo` +Build ClickHouse binary with `clang-11` and `address` sanitizer in `relwithdebuginfo` mode: ``` $ mkdir $HOME/some_clickhouse -$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-10 --sanitizer=address +$ ./packager --output-dir=$HOME/some_clickhouse --package-type binary --compiler=clang-11 --sanitizer=address $ ls -l $HOME/some_clickhouse -rwxr-xr-x 1 root root 787061952 clickhouse lrwxrwxrwx 1 root root 10 clickhouse-benchmark -> clickhouse diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index fccae66b66b..56b2af5cf84 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -37,23 +37,18 @@ RUN apt-get update \ bash \ build-essential \ ccache \ - clang-10 \ clang-11 \ - clang-tidy-10 \ clang-tidy-11 \ cmake \ curl \ - g++-9 \ - gcc-9 \ + g++-10 \ + gcc-10 \ gdb \ git \ gperf \ libicu-dev \ libreadline-dev \ - lld-10 \ lld-11 \ - llvm-10 \ - llvm-10-dev \ llvm-11 \ llvm-11-dev \ moreutils \ diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile index 902929a2644..2f1d28efe61 100644 --- a/docker/packager/deb/Dockerfile +++ b/docker/packager/deb/Dockerfile @@ -35,22 +35,15 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \ RUN apt-get update \ && apt-get install \ alien \ - clang-10 \ clang-11 \ - clang-tidy-10 \ clang-tidy-11 \ cmake \ debhelper \ devscripts \ - g++-9 \ - gcc-9 \ gdb \ git \ gperf \ - lld-10 \ lld-11 \ - llvm-10 \ - llvm-10-dev \ llvm-11 \ llvm-11-dev \ moreutils \ diff --git a/docker/packager/packager b/docker/packager/packager index 0e01d629db2..836f30dec42 100755 --- a/docker/packager/packager +++ b/docker/packager/packager @@ -181,9 +181,8 @@ if __name__ == "__main__": parser.add_argument("--clickhouse-repo-path", default=os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir)) parser.add_argument("--output-dir", required=True) parser.add_argument("--build-type", choices=("debug", ""), default="") - parser.add_argument("--compiler", choices=("clang-10", "clang-10-darwin", "clang-10-aarch64", "clang-10-freebsd", - "clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd", - "gcc-9", "gcc-10"), default="gcc-9") + parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd", + "gcc-10"), default="clang-11") 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") diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json index 58eef10f295..54f4e19bd94 100644 --- a/tests/ci/ci_config.json +++ b/tests/ci/ci_config.json @@ -71,16 +71,6 @@ "tidy": "disable", "with_coverage": false }, - { - "compiler": "clang-10", - "build-type": "", - "sanitizer": "", - "package-type": "deb", - "bundled": "bundled", - "splitted": "unsplitted", - "tidy": "disable", - "with_coverage": false - }, { "compiler": "clang-11", "build-type": "debug",