thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete compilers

Browse Source
This commit is contained in:
Alexey Milovidov 2021-04-28 07:16:48 +03:00
parent 5dd1c72502
commit eda56e52d8
5 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/packager/README.md
View File

@ -3,10 +3,10 @@ compilers and build settings. Correctly configured Docker daemon is single depen
Usage: Usage:
Build deb package with `gcc-9` in `debug` mode: Build deb package with `clang-11` in `debug` mode:
``` ```
$ mkdir deb/test_output $ 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 $ 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 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 -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: mode:
``` ```
$ mkdir $HOME/some_clickhouse $ 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 $ ls -l $HOME/some_clickhouse
-rwxr-xr-x 1 root root 787061952 clickhouse -rwxr-xr-x 1 root root 787061952 clickhouse
lrwxrwxrwx 1 root root 10 clickhouse-benchmark -> clickhouse lrwxrwxrwx 1 root root 10 clickhouse-benchmark -> clickhouse

9
docker/packager/binary/Dockerfile
View File

@ -37,23 +37,18 @@ RUN apt-get update \
bash \ bash \
build-essential \ build-essential \
ccache \ ccache \
clang-10 \
clang-11 \ clang-11 \
clang-tidy-10 \
clang-tidy-11 \ clang-tidy-11 \
cmake \ cmake \
curl \ curl \
g++-9 \ g++-10 \
gcc-9 \ gcc-10 \
gdb \ gdb \
git \ git \
gperf \ gperf \
libicu-dev \ libicu-dev \
libreadline-dev \ libreadline-dev \
lld-10 \
lld-11 \ lld-11 \
llvm-10 \
llvm-10-dev \
llvm-11 \ llvm-11 \
llvm-11-dev \ llvm-11-dev \
moreutils \ moreutils \

7
docker/packager/deb/Dockerfile
View File

@ -35,22 +35,15 @@ RUN curl -O https://clickhouse-builds.s3.yandex.net/utils/1/dpkg-deb \
RUN apt-get update \ RUN apt-get update \
&& apt-get install \ && apt-get install \
alien \ alien \
clang-10 \
clang-11 \ clang-11 \
clang-tidy-10 \
clang-tidy-11 \ clang-tidy-11 \
cmake \ cmake \
debhelper \ debhelper \
devscripts \ devscripts \
g++-9 \
gcc-9 \
gdb \ gdb \
git \ git \
gperf \ gperf \
lld-10 \
lld-11 \ lld-11 \
llvm-10 \
llvm-10-dev \
llvm-11 \ llvm-11 \
llvm-11-dev \ llvm-11-dev \
moreutils \ moreutils \

5
docker/packager/packager
View File

@ -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("--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("--output-dir", required=True)
parser.add_argument("--build-type", choices=("debug", ""), default="") parser.add_argument("--build-type", choices=("debug", ""), default="")
parser.add_argument("--compiler", choices=("clang-10", "clang-10-darwin", "clang-10-aarch64", "clang-10-freebsd", parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd",
"clang-11", "clang-11-darwin", "clang-11-aarch64", "clang-11-freebsd", "gcc-10"), default="clang-11")
"gcc-9", "gcc-10"), default="gcc-9")
parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="") parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
parser.add_argument("--unbundled", action="store_true") parser.add_argument("--unbundled", action="store_true")
parser.add_argument("--split-binary", action="store_true") parser.add_argument("--split-binary", action="store_true")

10
tests/ci/ci_config.json
View File

@ -71,16 +71,6 @@
"tidy": "disable", "tidy": "disable",
"with_coverage": false "with_coverage": false
}, },
{
"compiler": "clang-10",
"build-type": "",
"sanitizer": "",
"package-type": "deb",
"bundled": "bundled",
"splitted": "unsplitted",
"tidy": "disable",
"with_coverage": false
},
{ {
"compiler": "clang-11", "compiler": "clang-11",
"build-type": "debug", "build-type": "debug",