Fix travis

.travis.yml

@@ -1,4 +1,4 @@
-language: cpp
+language: generic
 
 matrix:
   include:
@@ -13,8 +13,9 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages: [ g++-7,            libicu-dev, libreadline-dev, libmysqlclient-dev, unixodbc-dev, libltdl-dev, libssl-dev, libboost-dev, zlib1g-dev, libdouble-conversion-dev, libzookeeper-mt-dev, libsparsehash-dev, librdkafka-dev, libcapnp-dev, libsparsehash-dev, libgoogle-perftools-dev, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo ]
+
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+        - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7"
 
       script:
         - utils/travis/normal.sh
@@ -35,12 +36,7 @@ matrix:
           packages: [ g++-7, clang-5.0, libicu-dev, libreadline-dev, libmysqlclient-dev, unixodbc-dev, libltdl-dev, libssl-dev, libboost-dev, zlib1g-dev, libdouble-conversion-dev, libzookeeper-mt-dev, libsparsehash-dev, librdkafka-dev, libcapnp-dev, libsparsehash-dev, libgoogle-perftools-dev, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo ]
 
       env:
-        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
-
-      before_script:
-        # fix gcc after clang
-        - export CC=clang-5.0
-        - export CXX=clang++-5.0
+        - MATRIX_EVAL="export CC=clang-5.0 && export CXX=clang++-5.0"
 
       script:
         - utils/travis/normal.sh
@@ -59,8 +55,35 @@ matrix:
         apt:
           packages: [ pbuilder, fakeroot, debhelper ]
 
+      env:
+        - MATRIX_EVAL="export CC=clang-5.0 && export CXX=clang++-5.0"
+
       script:
         - utils/travis/pbuilder.sh
 
+
+# TODO: test and enable
+#    - os: osx
+#      osx_image: xcode9.2
+#
+#      cache:
+#        ccache: true
+#        timeout: 1000
+#
+#      before_install:
+#        - brew install unixodbc libtool gettext zlib readline ccache gcc || true
+#        - brew link --overwrite gcc || true
+#
+#      env:
+#        - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7"
+#
+#      script:
+#        - utils/travis/normal.sh
+
+
+  allow_failures:
+    - os: osx
+
 before_install:
+    - echo "${MATRIX_EVAL}"
     - eval "${MATRIX_EVAL}"

debian/.pbuilderrc

@@ -160,8 +160,6 @@ esac
 # will test symbols
 EXTRAPACKAGES+=" gdb "
 
-export CCACHE_PREFIX=
-
 export DEB_BUILD_OPTIONS=parallel=`nproc`
 
 # Floating bug with permissions:

release

@@ -65,7 +65,7 @@ elif [[ $BUILD_TYPE == 'debug' ]]; then
 fi
 
 if [ -z "$THREAD_COUNT" ] ; then
-    THREAD_COUNT=`nproc || grep -c ^processor /proc/cpuinfo`
+    THREAD_COUNT=`nproc || grep -c ^processor /proc/cpuinfo || sysctl -n hw.ncpu || echo 4`
 fi
 
 CMAKE_FLAGS=" $LIBTCMALLOC_OPTS -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DUSE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"

utils/travis/normal.sh

@@ -22,12 +22,12 @@ cmake .. -DCMAKE_CXX_COMPILER=`which $CXX` -DCMAKE_C_COMPILER=`which $CC` \
     `# Does not optimize to speedup build, skip debug info to use less disk` \
     -DCMAKE_C_FLAGS_ADD="-O0 -g0" -DCMAKE_CXX_FLAGS_ADD="-O0 -g0" \
     `# ignore ccache disabler on trusty` \
-    -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/ccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/ccache \
+    -DCMAKE_C_COMPILER_LAUNCHER=`which ccache` -DCMAKE_CXX_COMPILER_LAUNCHER=`which ccache` \
     `# Use all possible contrib libs from system` \
     -DUNBUNDLED=1 \
     `# Disable all features` \
     -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DUSE_EMBEDDED_COMPILER=0 -DENABLE_TCMALLOC=0 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 \
-    && make -j `nproc || grep -c ^processor /proc/cpuinfo` clickhouse-bundle \
+    && make -j `nproc || grep -c ^processor /proc/cpuinfo || sysctl -n hw.ncpu || echo 4` clickhouse-bundle \
     `# Skip tests:` \
     `# 00281 requires internal compiler` \
     `# 00428 requires sudo (not all vms allow this)` \

utils/travis/pbuilder.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# env CXX=clang++-5.0 CC=clang-5.0 DH_VERBOSE=1 utils/travis/pbuilder.sh
+
 set -e
 set -x
 
@@ -14,7 +16,7 @@ env TEST_RUN=1 \
     `# travisci will not upload ccache cache after timeout (48min), use our less timeout` \
     PBUILDER_OPT="--timeout 35m" \
     `# clang faster than gcc` \
-    DEB_CC=clang-5.0 DEB_CXX=clang++-5.0 \
+    DEB_CC=$CC DEB_CXX=$CXX \
     CCACHE_SIZE=4G CCACHEDIR=$HOME/.ccache \
     `# Disable all features` \
     CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DUNBUNDLED=1 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DUSE_EMBEDDED_COMPILER=0 -DCMAKE_C_FLAGS_ADD='-O0 -g0' -DCMAKE_CXX_FLAGS_ADD='-O0 -g0'" \