提交 a6b75174 编写于 作者: J Jeff

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

MS-350 remove submodule

See merge request megasearch/milvus!356

Former-commit-id: 1ca543127d397ebdc23960f4b13d5a5feb87eaa2
...@@ -14,7 +14,7 @@ container('milvus-build-env') { ...@@ -14,7 +14,7 @@ container('milvus-build-env') {
dir ("cpp") { dir ("cpp") {
sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\"" 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) { } catch (exc) {
updateGitlabCommitStatus name: 'Build Engine', state: 'failed' updateGitlabCommitStatus name: 'Build Engine', state: 'failed'
......
...@@ -15,7 +15,7 @@ container('milvus-build-env') { ...@@ -15,7 +15,7 @@ container('milvus-build-env') {
dir ("cpp") { dir ("cpp") {
sh "git config --global user.email \"test@zilliz.com\"" sh "git config --global user.email \"test@zilliz.com\""
sh "git config --global user.name \"test\"" 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) { } catch (exc) {
updateGitlabCommitStatus name: 'Build Engine', state: 'failed' updateGitlabCommitStatus name: 'Build Engine', state: 'failed'
......
...@@ -101,7 +101,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then ...@@ -101,7 +101,7 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
-DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \ -DBUILD_FAISS_WITH_MKL=${BUILD_FAISS_WITH_MKL} \
-DKNOWHERE_BUILD_DIR=${KNOWHERE_BUILD_DIR} \ -DKNOWHERE_BUILD_DIR=${KNOWHERE_BUILD_DIR} \
-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \ -DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \
$@ ../" ../"
echo ${CMAKE_CMD} echo ${CMAKE_CMD}
${CMAKE_CMD} ${CMAKE_CMD}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册