milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch-0.4.0' into 'branch-0.4.0' 

MS-350 remove submodule

See merge request megasearch/milvus!356

Former-commit-id: e0298261a2db6840f3c0395d2623e8d093b552ef
pull/191/head
Jeff 2019-08-14 19:18:08 +08:00
parent 298d57a9dd 027ee6920c
commit 5a659fc5ec
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/jenkinsfile/milvus_build.groovy
View File

@ -14,7 +14,7 @@ container('milvus-build-env') {
dir ("cpp") {
sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\""
sh "./build.sh -t ${params.BUILD_TYPE} -j -u -c"
sh "./build.sh -t ${params.BUILD_TYPE} -k ${knowhere_build_dir} -j -u -c"
}
} catch (exc) {
updateGitlabCommitStatus name: 'Build Engine', state: 'failed'

2
ci/jenkinsfile/milvus_build_no_ut.groovy
View File

@ -15,7 +15,7 @@ container('milvus-build-env') {
dir ("cpp") {
sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\""
sh "./build.sh -t ${params.BUILD_TYPE}"
sh "./build.sh -t ${params.BUILD_TYPE} -k ${knowhere_build_dir}"
}
} catch (exc) {
updateGitlabCommitStatus name: 'Build Engine', state: 'failed'

2
cpp/build.sh
View File

@ -101,7 +101,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
-DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \
-DKNOWHERE_BUILD_DIR=${KNOWHERE_BUILD_DIR} \
-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \
$@ ../"
../"
echo ${CMAKE_CMD}
${CMAKE_CMD}