Unverified Commit bbb1ed42 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #321 from scsven/dev 

reside src/external in thirdparty
parents 2e9622ff 78d59bfb

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Please mark all change in change log and use the ticket from JIRA. 


## Bug

- \#246 - Exclude src/external folder from code coverage for jenkin ci

- \#248 - Reside src/external in thirdparty



## Feature

- \#12 - Pure CPU version for Milvus

ci/scripts/coverage.sh

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "*/src/server/Server.cpp" \

    "*/src/server/DBWrapper.cpp" \

    "*/src/server/grpc_impl/GrpcServer.cpp" \

    "*/src/external/*"

    "*/thirdparty/*"



if [ $? -ne 0 ]; then

    echo "gen ${FILE_INFO_OUTPUT_NEW} failed"

core/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ endif () 
set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR})

set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR})

set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)

set(MILVUS_THIRDPARTY_SRC ${PROJECT_SOURCE_DIR}/thirdparty)



include(ExternalProject)

include(DefineOptions)

core/build-support/lint_exclusions.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ 
*easylogging++*

*SqliteMetaImpl.cpp

*src/grpc*

*src/external*

*thirdparty*

*milvus/include*
 
 No newline at end of file

core/coverage.sh

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \ 
    "*/src/server/Server.cpp" \

    "*/src/server/DBWrapper.cpp" \

    "*/src/server/grpc_impl/GrpcServer.cpp" \

    "*/src/external/*"

    "*/thirdparty/*"



if [ $? -ne 0 ]; then

    echo "generate ${FILE_INFO_OUTPUT_NEW} failed"