Commit 0d8d6c08 authored by peng.xu's avatar peng.xu
Browse files

Merge branch 'branch-0.5.0' into '0.5.0' 

#31 - make clang-format failed after run build.sh -l

See merge request megasearch/milvus!759

Former-commit-id: 10bb642c2720a928c673b3f832161390158e9b66
parents 0466640f b9f522c4

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-658 - Fix SQ8 Hybrid can't search

- \#20 - C++ sdk example get grpc error 

- \#23 - Add unittest to improve code coverage

- \#31 - make clang-format failed after run build.sh -l



## Improvement

- MS-552 - Add and change the easylogging library

core/build.sh

+4 −5
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ fi 


cd ${BUILD_OUTPUT_DIR}



# remove make cache since build.sh -l use default variables

# force update the variables each time

make rebuild_cache



CMAKE_CMD="cmake \

-DBUILD_UNIT_TEST=${BUILD_UNITTEST} \

-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
@@ -115,7 +119,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
    make lint

    if [ $? -ne 0 ]; then

        echo "ERROR! cpplint check failed"

        rm -f CMakeCache.txt

        exit 1

    fi

    echo "cpplint check passed!"
@@ -124,7 +127,6 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
    make check-clang-format

    if [ $? -ne 0 ]; then

        echo "ERROR! clang-format check failed"

        rm -f CMakeCache.txt

        exit 1

    fi

    echo "clang-format check passed!"
@@ -133,12 +135,9 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then 
#    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!"



    rm -f CMakeCache.txt

else

    # compile and build

    make -j 4 || exit 1