Unverified Commit 7f3b5258 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #559 from ZhifengZhang-CN/0.6.0 

change milvus db_path to CMAKE_INSTALL_PREFIX
parents a48cbbca db614f92

ci/scripts/check_ccache.sh

+14 −17
Original line number Diff line number Diff line
@@ -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,18 @@ do 
            exit 0

        fi

    fi

}



for BRANCH_NAME in ${BRANCH_NAMES}

do

    if [[ "${BRANCH_NAME}" != "HEAD" ]];then

        check_ccache ${BRANCH_NAME}

    fi

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

ci/scripts/update_ccache.sh

+12 −10
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ REMOTE_PACKAGE_PATH="${ARTIFACTORY_URL}/${BRANCH_NAME}" 


ccache --show-stats



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}"
@@ -67,3 +68,4 @@ else 
        echo "Uploading ccache package file fault !"

        exit 1

    fi

fi

core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)