File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed
Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -2,16 +2,15 @@ find_package(Git REQUIRED)
22
33if (DEFINED ENV{GITHUB_BRANCH_NAME})
44 set (GIT_BUILD_BRANCH $ENV{GITHUB_BRANCH_NAME} )
5- set (GITHUB_HEAD_SHA $ENV{GITHUB_HEAD_SHA} )
6- string (SUBSTRING ${GITHUB_HEAD_SHA} 0 7 GIT_COMMIT_HASH)
5+ set (GIT_COMMIT_HASH $ENV{GITHUB_HEAD_SHA} )
76else ()
87 set (GIT_COMMAND branch --show-current)
98 execute_process (
109 COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_BUILD_BRANCH
1110 OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
1211 )
1312
14- set (GIT_COMMAND rev-parse --short HEAD)
13+ set (GIT_COMMAND rev-parse HEAD)
1514 execute_process (
1615 COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_HASH
1716 OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY
@@ -41,9 +40,11 @@ if (RC EQUAL 0)
4140 set (DOC_CLIO_VERSION "${TAG} " )
4241else ()
4342 message (STATUS "Error finding tag in git: ${ERR} " )
44- message (STATUS "Will use 'YYYYMMDDHMS-<branch>-<git- rev>' as Clio version" )
43+ message (STATUS "Will use 'YYYYMMDDHMS-<branch>-<git short rev>' as Clio version" )
4544
46- set (CLIO_VERSION "${BUILD_DATE} -${GIT_BUILD_BRANCH} -${GIT_COMMIT_HASH} " )
45+ string (SUBSTRING ${GIT_COMMIT_HASH} 0 7 GIT_COMMIT_HASH_SHORT)
46+
47+ set (CLIO_VERSION "${BUILD_DATE} -${GIT_BUILD_BRANCH} -${GIT_COMMIT_HASH_SHORT} " )
4748 set (DOC_CLIO_VERSION "develop" )
4849endif ()
4950
You can’t perform that action at this time.
0 commit comments