From b8ff38ae7a21fb861b7733bf9fd60505dd37cc5e Mon Sep 17 00:00:00 2001 From: minqiyang Date: Mon, 9 Jul 2018 14:22:30 +0800 Subject: [PATCH] Remove the new git branching model from this pr --- cmake/version.cmake | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index f95cc40d199..79b8e8ac496 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -11,20 +11,6 @@ while ("${PADDLE_VERSION}" STREQUAL "") RESULT_VARIABLE GIT_RESULT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if (NOT ${GIT_RESULT}) - # Get current branch name - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref ${tmp_version} - WORKING_DIRECTORY ${PADDLE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_BRANCH_NAME - RESULT_VARIABLE GIT_BRANCH_RESULT - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - # If current branch is develop, then version will be latest - if (NOT ${GIT_BRANCH_RESULT}) - if (${GIT_BRANCH_NAME} MATCHES "develop") - set(PADDLE_VERSION "latest") - continue() - endif() - endif() # Check the tag is a correct version if (${GIT_TAG_NAME} MATCHES "${COMMIT_VERSION_REGEX}") # if no tag was found, set PADDLE_VERSION to latest -- GitLab