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

Merge pull request #320 from ZhifengZhang-CN/0.6.0 

Fix determine Milvus version from git branch name bug
parents bea4ddc1 7aef840e

core/CMakeLists.txt

+2 −4
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ string(REGEX REPLACE "\n" "" BUILD_TIME ${BUILD_TIME}) 
message(STATUS "Build time = ${BUILD_TIME}")



MACRO(GET_GIT_BRANCH_NAME GIT_BRANCH_NAME)

    execute_process(COMMAND "git" rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    if (GIT_BRANCH_NAME STREQUAL "")

        execute_process(COMMAND "git" symbolic-ref --short -q HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    endif ()

    execute_process(COMMAND sh "-c" "git log --decorate | head -n 1 | sed 's/.*(\\(.*\\))/\\1/' | sed 's/.* \\(.*\\),.*/\\1/' | sed 's=[a-zA-Z]*\/==g'"

                    OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

ENDMACRO(GET_GIT_BRANCH_NAME)



GET_GIT_BRANCH_NAME(GIT_BRANCH_NAME)