ci fixes

ci/build-normal.sh

@@ -3,6 +3,9 @@ set -e -x
 
 source default-config
 
+ccache -M 32G
+ccache -s
+
 [[ -d "${WORKSPACE}/sources" ]] || die "Run get-sources.sh first"
 
 mkdir -p "${WORKSPACE}/build"

ci/install-libraries.sh

@@ -5,7 +5,7 @@ source default-config
 
 # TODO Non-debian systems
 
-$SUDO apt-get -y install libssl-dev libicu-dev libreadline-dev libmysqlclient-dev unixodbc-dev
+$SUDO apt-get -y install libssl-dev libicu-dev libreadline-dev libmariadbclient-dev unixodbc-dev ccache
 
 if [[ "$ENABLE_EMBEDDED_COMPILER" == 1 && "$USE_LLVM_LIBRARIES_FROM_SYSTEM" == 1 ]]; then
     $SUDO apt-get -y install liblld-5.0-dev libclang-5.0-dev

ci/jobs/quick-build/config

@@ -7,6 +7,4 @@ BUILD_METHOD=normal
 BUILD_TARGETS=clickhouse
 BUILD_TYPE=Debug
 ENABLE_EMBEDDED_COMPILER=0
-CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_TCMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0"
-
-# TODO it doesn't build with -D ENABLE_NETSSL=0 -D ENABLE_MONGODB=0 -D ENABLE_MYSQL=0 -D ENABLE_DATA_ODBC=0
+CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_TCMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0 -D DISABLE_POCO_SSL=1 -D OPENSSL_FOUND=0 -D ENABLE_NETSSL=0 -D ENABLE_CRYPTO=0 -D Poco_NetSSL_FOUND=0 -D ENABLE_MONGODB=0 -D ENABLE_MYSQL=0 -D ENABLE_DATA_ODBC=0"

ci/run-with-docker.sh

 #!/usr/bin/env bash
 set -e -x
 
+mkdir -p /var/cache/ccache
+DOCKER_ENV+=" --mount=type=bind,source=/var/cache/ccache,destination=/ccache -e CCACHE_DIR=/ccache "
+
 PROJECT_ROOT="$(cd "$(dirname "$0")/.."; pwd -P)"
 [[ -n "$CONFIG" ]] && DOCKER_ENV="--env=CONFIG"
 docker run -t --network=host --mount=type=bind,source=${PROJECT_ROOT},destination=/ClickHouse --workdir=/ClickHouse/ci $DOCKER_ENV "$1" "$2"

cmake/find_poco.cmake

@@ -84,7 +84,7 @@ elseif (NOT MISSING_INTERNAL_POCO_LIBRARY)
     endif ()
 
     # TODO! fix internal ssl
-    if (OPENSSL_FOUND AND NOT USE_INTERNAL_SSL_LIBRARY)
+    if (OPENSSL_FOUND AND NOT USE_INTERNAL_SSL_LIBRARY AND NOT DISABLE_POCO_SSL)
         set (Poco_NetSSL_FOUND 1)
         set (Poco_NetSSL_LIBRARY PocoNetSSL)
         set (Poco_Crypto_LIBRARY PocoCrypto)

contrib/CMakeLists.txt

@@ -128,7 +128,7 @@ if (USE_INTERNAL_POCO_LIBRARY)
     set (_save ${ENABLE_TESTS})
     set (ENABLE_TESTS 0)
     set (CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
-    if (USE_INTERNAL_SSL_LIBRARY)
+    if (USE_INTERNAL_SSL_LIBRARY OR DISABLE_POCO_SSL)
         set (DISABLE_INTERNAL_OPENSSL 1 CACHE INTERNAL "")
         set (ENABLE_NETSSL 0 CACHE INTERNAL "") # TODO!
         set (ENABLE_CRYPTO 0 CACHE INTERNAL "") # TODO!
@@ -141,9 +141,14 @@ if (USE_INTERNAL_POCO_LIBRARY)
     set (ENABLE_TESTS ${_save})
     set (CMAKE_CXX_FLAGS ${save_CMAKE_CXX_FLAGS})
     set (CMAKE_C_FLAGS ${save_CMAKE_C_FLAGS})
-    if (OPENSSL_FOUND AND TARGET Crypto)
-        # Bug in poco https://github.com/pocoproject/poco/pull/2100 found on macos
-        target_include_directories(Crypto PUBLIC ${OPENSSL_INCLUDE_DIR})
+
+    if (DISABLE_POCO_SSL)
+        set (Poco_NetSSL_FOUND 0)
+    else()
+        if (OPENSSL_FOUND AND TARGET Crypto)
+            # Bug in poco https://github.com/pocoproject/poco/pull/2100 found on macos
+            target_include_directories(Crypto PUBLIC ${OPENSSL_INCLUDE_DIR})
+        endif ()
     endif ()
 endif ()