remove debug

CMakeLists.txt

@@ -72,7 +72,9 @@ include (cmake/find/ccache.cmake)
 # [2021-03-31T18:06:32.655327 36900] Command line: /usr/bin/ccache prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/clang++-11 - ...... std=gnu++2a -MD -MT src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -MF src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o.d -o src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -c ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
 #
 # [2021-03-31T18:06:32.656704 36900] Multiple input files: /usr/bin/clang++-11 and ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
-
+#
+# Another way would be to use --ccache-skip option before clang++-11 to make
+# ccache ignore it.
 option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling." OFF)
 if (ENABLE_CHECK_HEAVY_BUILDS)
     # set DATA (since RSS does not work since 2.6.x+) to 2G

docker/packager/binary/Dockerfile

@@ -35,35 +35,36 @@ RUN apt-get update \
 RUN apt-get update \
     && apt-get install \
         bash \
-        cmake \
+        build-essential \
         ccache \
-        curl \
-        gcc-9 \
-        g++-9 \
         clang-10 \
-        clang-tidy-10 \
-        lld-10 \
-        llvm-10 \
-        llvm-10-dev \
         clang-11 \
+        clang-tidy-10 \
         clang-tidy-11 \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
+        cmake \
+        cmake \
+        curl \
+        g++-9 \
+        gcc-9 \
+        gdb \
+        git \
+        gperf \
+        gperf \
+        intel-opencl-icd \
         libicu-dev \
         libreadline-dev \
+        lld-10 \
+        lld-11 \
+        llvm-10 \
+        llvm-10-dev \
+        llvm-11 \
+        llvm-11-dev \
+        moreutils \
         ninja-build \
-        gperf \
-        git \
-        opencl-headers \
         ocl-icd-libopencl1 \
-        intel-opencl-icd \
-        tzdata \
-        gperf \
-        cmake \
-        gdb \
+        opencl-headers \
         rename \
-        build-essential \
+        tzdata \
         --yes --no-install-recommends
 
 # This symlink required by gcc to find lld compiler
@@ -111,4 +112,4 @@ RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 
 COPY build.sh /
-CMD ["/bin/bash", "/build.sh"]
+CMD ["bash", "-c", "/build.sh 2>&1 | ts"]

docker/packager/binary/build.sh

@@ -11,8 +11,9 @@ tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolc
 mkdir -p build/cmake/toolchain/freebsd-x86_64
 tar xJf freebsd-11.3-toolchain.tar.xz -C build/cmake/toolchain/freebsd-x86_64 --strip-components=1
 
-export CCACHE_LOGFILE=/output/ccache.log
-export CCACHE_DEBUG=1
+# # Uncomment to debug ccache
+# export CCACHE_LOGFILE=/output/ccache.log
+# export CCACHE_DEBUG=1
 
 mkdir -p build/build_docker
 cd build/build_docker
@@ -24,14 +25,8 @@ rm -f CMakeCache.txt
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
 cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 
-# FIXME Check how ccache is used for contribs. The contrib/all target doesn't build successfully, but we don't care.
 # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
-ninja $NINJA_FLAGS --verbose contrib/all ||:
-ccache --show-stats ||:
-ccache --zero-stats ||:
-
-# shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
-ninja $NINJA_FLAGS --verbose clickhouse-bundle
+ninja $NINJA_FLAGS clickhouse-bundle
 
 ccache --show-stats ||:
 
@@ -83,12 +78,18 @@ then
     mv "$COMBINED_OUTPUT.tgz" /output
 fi
 
-mkdir /output/ccache
-find . -name '*.ccache-*' -print -exec mv '{}' /output/ccache \;
-tar -czvf "/output/ccache.tgz" /output/ccache
-rm -rf /output/ccache
+if [ "${CCACHE_DEBUG:-}" == "1"]
+then
+    mkdir /output/ccache
+    find . -name '*.ccache-*' -print -exec mv '{}' /output/ccache \;
+    tar -czvf "/output/ccache.tgz" /output/ccache
+    rm -rf /output/ccache
+fi
 
-# Compress the log as well, or else the CI will try to compress all log files in place,
-# and will fail because this directory is not writable.
-gzip "/output/ccache.log"
+if ! [ -z "$CCACHE_LOGFILE" ]
+then
+    # Compress the log as well, or else the CI will try to compress all log
+    # files in place, and will fail because this directory is not writable.
+    gzip "$CCACHE_LOGFILE"
+fi