admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from milvus-io/0.5.0

Browse Source 
0.5.0

Former-commit-id: bb2f7529090f1710b99f5d1d8c4abae293572818
This commit is contained in:
Jin Hai 2019-10-16 17:15:48 +08:00 committed by GitHub
commit b0a35f2af5
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/jenkinsfile/milvus_build.groovy
View File

@ -15,7 +15,7 @@ container('milvus-build-env') {
&& export JFROG_USER_NAME='${USERNAME}' \ && export JFROG_USER_NAME='${USERNAME}' \
&& export JFROG_PASSWORD='${PASSWORD}' \ && export JFROG_PASSWORD='${PASSWORD}' \
&& export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \ && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \
&& ./build.sh -t ${params.BUILD_TYPE} -j -u -c" && ./build.sh -t ${params.BUILD_TYPE} -d /opt/milvus -j -u -c"
sh "./coverage.sh -u root -p 123456 -t 192.168.1.194" sh "./coverage.sh -u root -p 123456 -t 192.168.1.194"
} }

2
ci/jenkinsfile/milvus_build_no_ut.groovy
View File

@ -15,7 +15,7 @@ container('milvus-build-env') {
&& export JFROG_USER_NAME='${USERNAME}' \ && export JFROG_USER_NAME='${USERNAME}' \
&& export JFROG_PASSWORD='${PASSWORD}' \ && export JFROG_PASSWORD='${PASSWORD}' \
&& export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \ && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \
&& ./build.sh -t ${params.BUILD_TYPE} -j" && ./build.sh -t ${params.BUILD_TYPE} -j -d /opt/milvus"
} }
} }
} catch (exc) { } catch (exc) {

20
core/build.sh
View File

@ -1,11 +1,12 @@
#!/bin/bash #!/bin/bash
BUILD_OUTPUT_DIR="cmake_build"
BUILD_TYPE="Debug" BUILD_TYPE="Debug"
BUILD_UNITTEST="OFF" BUILD_UNITTEST="OFF"
INSTALL_PREFIX=$(pwd)/milvus INSTALL_PREFIX=$(pwd)/milvus
MAKE_CLEAN="OFF" MAKE_CLEAN="OFF"
BUILD_COVERAGE="OFF" BUILD_COVERAGE="OFF"
DB_PATH="/opt/milvus" DB_PATH="/tmp/milvus"
PROFILING="OFF" PROFILING="OFF"
USE_JFROG_CACHE="OFF" USE_JFROG_CACHE="OFF"
RUN_CPPLINT="OFF" RUN_CPPLINT="OFF"
@ -40,8 +41,8 @@ do
RUN_CPPLINT="ON" RUN_CPPLINT="ON"
;; ;;
r) r)
if [[ -d cmake_build ]]; then if [[ -d ${BUILD_OUTPUT_DIR} ]]; then
rm ./cmake_build -r rm ./${BUILD_OUTPUT_DIR} -r
MAKE_CLEAN="ON" MAKE_CLEAN="ON"
fi fi
;; ;;
@ -62,7 +63,7 @@ do
parameter: parameter:
-p: install prefix(default: $(pwd)/milvus) -p: install prefix(default: $(pwd)/milvus)
-d: db path(default: /opt/milvus) -d: db data path(default: /tmp/milvus)
-t: build type(default: Debug) -t: build type(default: Debug)
-u: building unit test options(default: OFF) -u: building unit test options(default: OFF)
-l: run cpplint, clang-format and clang-tidy(default: OFF) -l: run cpplint, clang-format and clang-tidy(default: OFF)
@ -84,11 +85,11 @@ usage:
esac esac
done done
if [[ ! -d cmake_build ]]; then if [[ ! -d ${BUILD_OUTPUT_DIR} ]]; then
mkdir cmake_build mkdir ${BUILD_OUTPUT_DIR}
fi fi
cd cmake_build cd ${BUILD_OUTPUT_DIR}
CMAKE_CMD="cmake \ CMAKE_CMD="cmake \
-DBUILD_UNIT_TEST=${BUILD_UNITTEST} \ -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \
@ -114,6 +115,7 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
make lint make lint
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR! cpplint check failed" echo "ERROR! cpplint check failed"
rm -f CMakeCache.txt
exit 1 exit 1
fi fi
echo "cpplint check passed!" echo "cpplint check passed!"
@ -122,6 +124,7 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
make check-clang-format make check-clang-format
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR! clang-format check failed" echo "ERROR! clang-format check failed"
rm -f CMakeCache.txt
exit 1 exit 1
fi fi
echo "clang-format check passed!" echo "clang-format check passed!"
@ -130,9 +133,12 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
# make check-clang-tidy # make check-clang-tidy
# if [ $? -ne 0 ]; then # if [ $? -ne 0 ]; then
# echo "ERROR! clang-tidy check failed" # echo "ERROR! clang-tidy check failed"
# rm -f CMakeCache.txt
# exit 1 # exit 1
# fi # fi
# echo "clang-tidy check passed!" # echo "clang-tidy check passed!"
rm -f CMakeCache.txt
else else
# compile and build # compile and build
make -j 4 || exit 1 make -j 4 || exit 1