From be384f22f9e6d61fc113d1fb925705ce84d2ebcb Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Wed, 6 Nov 2019 17:55:30 +0800
Subject: [PATCH] update ci/scripts/build.sh

---
 ci/scripts/build.sh             | 39 ++++-----------------------------
 ci/travis/install_dependency.sh |  4 ++--
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index fb6f94f670..6276359fae 100755
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
@@ -76,10 +76,6 @@ fi
 
 pushd ${CORE_BUILD_DIR}
 
-# remove make cache since build.sh -l use default variables
-# force update the variables each time
-make rebuild_cache
-
 CMAKE_CMD="cmake \
 -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@@ -91,33 +87,6 @@ ${MILVUS_CORE_DIR}"
 echo ${CMAKE_CMD}
 ${CMAKE_CMD}
 
-if [[ ${RUN_CPPLINT} == "ON" ]]; then
-    # cpplint check
-    make lint
-    if [ $? -ne 0 ]; then
-        echo "ERROR! cpplint check failed"
-        exit 1
-    fi
-    echo "cpplint check passed!"
-
-    # clang-format check
-    make check-clang-format
-    if [ $? -ne 0 ]; then
-        echo "ERROR! clang-format check failed"
-        exit 1
-    fi
-    echo "clang-format check passed!"
-
-#    # clang-tidy check
-#    make check-clang-tidy
-#    if [ $? -ne 0 ]; then
-#        echo "ERROR! clang-tidy check failed"
-#        rm -f CMakeCache.txt
-#        exit 1
-#    fi
-#    echo "clang-tidy check passed!"
-else
-    # compile and build
-    make -j8 || exit 1
-    make install || exit 1
-fi
+# compile and build
+make -j8 || exit 1
+make install || exit 1
diff --git a/ci/travis/install_dependency.sh b/ci/travis/install_dependency.sh
index bc4a972b8f..cec4e9c30f 100755
--- a/ci/travis/install_dependency.sh
+++ b/ci/travis/install_dependency.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
 wget -P /tmp https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
 
@@ -32,4 +32,4 @@ sudo apt-get install -y -q --no-install-recommends \
 sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so \
   /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so
 
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64
\ No newline at end of file
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64