未验证 提交 f456c8be 编写于 作者: W wopeizl 提交者: GitHub

rename the default version from '0.0.0' to 'latest' (#17304)

* rename the default version from '0.0.0' to 'latest'
上级 5e5e7b33
...@@ -3,6 +3,8 @@ set(PADDLE_VERSION $ENV{PADDLE_VERSION}) ...@@ -3,6 +3,8 @@ set(PADDLE_VERSION $ENV{PADDLE_VERSION})
set(tmp_version "HEAD") set(tmp_version "HEAD")
set(TAG_VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(\\.(a|b|rc)\\.[0-9]+)?") set(TAG_VERSION_REGEX "[0-9]+\\.[0-9]+\\.[0-9]+(\\.(a|b|rc)\\.[0-9]+)?")
set(COMMIT_VERSION_REGEX "[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+") set(COMMIT_VERSION_REGEX "[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+[0-9a-f]+")
set(LATEST_PADDLE_VERSION "latest")
while ("${PADDLE_VERSION}" STREQUAL "") while ("${PADDLE_VERSION}" STREQUAL "")
# Check current branch name # Check current branch name
execute_process( execute_process(
...@@ -23,8 +25,8 @@ while ("${PADDLE_VERSION}" STREQUAL "") ...@@ -23,8 +25,8 @@ while ("${PADDLE_VERSION}" STREQUAL "")
if (${GIT_BRANCH_NAME} MATCHES "release/${TAG_VERSION_REGEX}") if (${GIT_BRANCH_NAME} MATCHES "release/${TAG_VERSION_REGEX}")
# Check the tag is a correct version # Check the tag is a correct version
if (${GIT_TAG_NAME} MATCHES "${COMMIT_VERSION_REGEX}") if (${GIT_TAG_NAME} MATCHES "${COMMIT_VERSION_REGEX}")
# if no tag was found, set PADDLE_VERSION to 0.0.0 to represent latest # if no tag was found, set PADDLE_VERSION to "latest"
set(PADDLE_VERSION "0.0.0") set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}")
elseif (${GIT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}") elseif (${GIT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}")
string(REPLACE "v" "" PADDLE_VERSION ${GIT_TAG_NAME}) string(REPLACE "v" "" PADDLE_VERSION ${GIT_TAG_NAME})
else() # otherwise, get the previous git tag name. else() # otherwise, get the previous git tag name.
...@@ -42,19 +44,19 @@ while ("${PADDLE_VERSION}" STREQUAL "") ...@@ -42,19 +44,19 @@ while ("${PADDLE_VERSION}" STREQUAL "")
if (${GIT_EXACT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}") if (${GIT_EXACT_TAG_NAME} MATCHES "v${TAG_VERSION_REGEX}")
string(REPLACE "v" "" PADDLE_VERSION ${GIT_EXACT_TAG_NAME}) string(REPLACE "v" "" PADDLE_VERSION ${GIT_EXACT_TAG_NAME})
else() else()
set(PADDLE_VERSION "0.0.0") set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}")
endif() endif()
else() else()
# otherwise, we always set PADDLE_VERSION to 0.0.0 to represent latest # otherwise, we always set PADDLE_VERSION to "latest"
set(PADDLE_VERSION "0.0.0") set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}")
endif() endif()
endif() endif()
else() else()
set(PADDLE_VERSION "0.0.0") set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}")
message(WARNING "Cannot add paddle version from git tag") message(WARNING "Cannot add paddle version from git tag")
endif() endif()
else() else()
set(PADDLE_VERSION "0.0.0") set(PADDLE_VERSION "${LATEST_PADDLE_VERSION}")
message(WARNING "Cannot add paddle version for wrong git branch result") message(WARNING "Cannot add paddle version for wrong git branch result")
endif() endif()
endwhile() endwhile()
......
...@@ -30,18 +30,14 @@ class VersionTest(unittest.TestCase): ...@@ -30,18 +30,14 @@ class VersionTest(unittest.TestCase):
self._commit_regex = "[0-9a-f]{5,49}" self._commit_regex = "[0-9a-f]{5,49}"
def test_check_output(self): def test_check_output(self):
# check commit format
self.assertTrue(re.match(self._commit_regex, fluid_version.commit))
self.assertTrue(isinstance(fluid_version.istaged, bool)) self.assertTrue(isinstance(fluid_version.istaged, bool))
# check version format # check version format
if fluid_version.istaged: if fluid_version.istaged:
self.assertEqual(fluid_version.major, 0) self.assertEqual(fluid_version.full_version, "latest")
self.assertEqual(fluid_version.minor, 0)
self.assertEqual(fluid_version.patch, "0")
self.assertEqual(fluid_version.rc, 0)
self.assertEqual(fluid_version.full_version, "0.0.0")
else: else:
# check commit format
self.assertTrue(re.match(self._commit_regex, fluid_version.commit))
self.assertTrue(re.match(self._major_regex, fluid_version.major)) self.assertTrue(re.match(self._major_regex, fluid_version.major))
self.assertTrue(re.match(self._minor_regex, fluid_version.minor)) self.assertTrue(re.match(self._minor_regex, fluid_version.minor))
self.assertTrue(re.match(self._patch_regex, fluid_version.patch)) self.assertTrue(re.match(self._patch_regex, fluid_version.patch))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册