From 4f9cf7df60c2848e8c6dad9b52d0d7c67fca7413 Mon Sep 17 00:00:00 2001 From: "zhenxiang.li" Date: Fri, 21 Jun 2019 08:47:39 +0000 Subject: [PATCH 1/2] fix build coverage judge Former-commit-id: 7ec10893aa77e53ad8a76b40277dcd19221aa4af --- cpp/build.sh | 8 +++++--- cpp/coverage.sh | 0 2 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 cpp/coverage.sh diff --git a/cpp/build.sh b/cpp/build.sh index fde45e8ce8..f1936559ad 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -64,7 +64,7 @@ cd cmake_build CUDA_COMPILER=/usr/local/cuda/bin/nvcc -if [[ ${MAKE_CLEAN} = "ON" ]]; then +if [[ ${MAKE_CLEAN} == "ON" ]]; then CMAKE_CMD="cmake -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ @@ -84,8 +84,10 @@ if [[ ${BUILD_TYPE} != "Debug" ]]; then strip src/milvus_server fi -if [[ ${BUILD_COVERAGE} = "ON" ]]; then - bash coverage.sh +if [[ ${BUILD_COVERAGE} == "ON" ]]; then + cd - + bash `pwd`/coverage.sh + cd - fi make install diff --git a/cpp/coverage.sh b/cpp/coverage.sh old mode 100644 new mode 100755 From b3c6e3b853df85c87c09c0e7aea08440ec6e40fc Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 21 Jun 2019 16:57:25 +0800 Subject: [PATCH 2/2] update cpp CHANGELOG.md Former-commit-id: 708d7bfc5ad38f27c265bb767f4edf55e0faa5ff --- cpp/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index a32c991748..49612ccdad 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -5,6 +5,7 @@ Please mark all change in change log and use the ticket from JIRA. # Milvus 0.3.0 (TBD) ## Bug +- MS-102 - Fix build script file condition error - MS-80 - Fix server hang issue - MS-89 - Fix compile failed, libgpufaiss.a link missing - MS-90 - Fix arch match incorrect on ARM