From d3d3de73fb48b2c55b0cc1178f41acbcf0d19827 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 27 Nov 2019 10:09:20 +0800 Subject: [PATCH 1/3] change milvus db_path to CMAKE_INSTALL_PREFIX --- ci/scripts/check_ccache.sh | 29 ++++++++++++----------------- core/CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 9477433876..30a5d38741 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -41,12 +41,12 @@ if [[ -z "${ARTIFACTORY_URL}" || "${ARTIFACTORY_URL}" == "" ]];then exit 1 fi -for BRANCH_NAME in ${BRANCH_NAMES} -do - echo "fetching ${BRANCH_NAME}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" - wget -q --method HEAD "${ARTIFACTORY_URL}/${BRANCH_NAME}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" +check_ccache() { + BRANCH=$1 + echo "fetching ${BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" + wget -q --method HEAD "${ARTIFACTORY_URL}/${BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" if [[ $? == 0 ]];then - wget "${ARTIFACTORY_URL}/${BRANCH_NAME}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" && \ + wget "${ARTIFACTORY_URL}/${BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" && \ mkdir -p ${CCACHE_DIRECTORY} && \ tar zxf ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz -C ${CCACHE_DIRECTORY} && \ rm ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz @@ -55,21 +55,16 @@ do exit 0 fi fi +} + +for BRANCH_NAME in ${BRANCH_NAMES} +do + check_ccache ${BRANCH_NAME} done if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then - echo "fetching ${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" - wget -q --method HEAD "${ARTIFACTORY_URL}/${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" - if [[ $? == 0 ]];then - wget "${ARTIFACTORY_URL}/${CHANGE_BRANCH}/ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz" && \ - mkdir -p ${CCACHE_DIRECTORY} && \ - tar zxf ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz -C ${CCACHE_DIRECTORY} && \ - rm ccache-${OS_NAME}-${CODE_NAME}-${BUILD_ENV_DOCKER_IMAGE_ID}.tar.gz - if [[ $? == 0 ]];then - echo "found cache" - exit 0 - fi - fi + check_ccache ${CHANGE_BRANCH} + check_ccache ${BRANCH_NAME} fi echo "could not download cache" && exit 1 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 01d0e1b9f2..bfa391f46f 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -187,7 +187,7 @@ endif () add_custom_target(Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean) if ("${MILVUS_DB_PATH}" STREQUAL "") - set(MILVUS_DB_PATH "/tmp/milvus") + set(MILVUS_DB_PATH "${CMAKE_INSTALL_PREFIX}") endif () if (MILVUS_GPU_VERSION) From d2086a1d51011e72306bce5cf51e2f051123ed17 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 27 Nov 2019 10:39:35 +0800 Subject: [PATCH 2/3] update update_ccache.sh --- ci/scripts/update_ccache.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ci/scripts/update_ccache.sh b/ci/scripts/update_ccache.sh index 17798088a3..f4afc29d1e 100755 --- a/ci/scripts/update_ccache.sh +++ b/ci/scripts/update_ccache.sh @@ -56,14 +56,16 @@ REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}" ccache --show-stats -echo "Updating ccache package file: ${PACKAGE_FILE}" -tar zcf ./${PACKAGE_FILE} -C ${HOME}/.ccache . -echo "Uploading ccache package file ${PACKAGE_FILE} to ${REMOTE_PACKAGE_PATH}" -curl -u${ARTIFACTORY_USER}:${ARTIFACTORY_PASSWORD} -T ${PACKAGE_FILE} ${REMOTE_PACKAGE_PATH}/${PACKAGE_FILE} -if [[ $? == 0 ]];then - echo "Uploading ccache package file success !" - exit 0 -else - echo "Uploading ccache package file fault !" - exit 1 +if [[ "${BRANCH_NAME}" != "HEAD" ]];then + echo "Updating ccache package file: ${PACKAGE_FILE}" + tar zcf ./${PACKAGE_FILE} -C ${HOME}/.ccache . + echo "Uploading ccache package file ${PACKAGE_FILE} to ${REMOTE_PACKAGE_PATH}" + curl -u${ARTIFACTORY_USER}:${ARTIFACTORY_PASSWORD} -T ${PACKAGE_FILE} ${REMOTE_PACKAGE_PATH}/${PACKAGE_FILE} + if [[ $? == 0 ]];then + echo "Uploading ccache package file success !" + exit 0 + else + echo "Uploading ccache package file fault !" + exit 1 + fi fi From db614f92414431a23fa4a4c30d0f550165990780 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Wed, 27 Nov 2019 10:51:13 +0800 Subject: [PATCH 3/3] update check_ccache.sh --- ci/scripts/check_ccache.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/scripts/check_ccache.sh b/ci/scripts/check_ccache.sh index 30a5d38741..17e3ed2f43 100755 --- a/ci/scripts/check_ccache.sh +++ b/ci/scripts/check_ccache.sh @@ -59,7 +59,9 @@ check_ccache() { for BRANCH_NAME in ${BRANCH_NAMES} do - check_ccache ${BRANCH_NAME} + if [[ "${BRANCH_NAME}" != "HEAD" ]];then + check_ccache ${BRANCH_NAME} + fi done if [[ -n "${CHANGE_BRANCH}" && "${BRANCH_NAME}" =~ "PR-" ]];then