Build: Fixed branch name displayed by appveyor binaries
(cherry picked from commit 85671f20d866797a5a401d714b183d07c55f8d83)
This commit is contained in:
1 parent
1d9d14e3f5
commit
d255fb3dbd
1 file changed
+30
@@ -62,6 +62,36 @@ else()
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
|
||||
# when ran on CI, repository is put in detached HEAD state, attempt to scan for known local branches
|
||||
if(NOT rev_branch)
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXECUTABLE}" for-each-ref --points-at=HEAD refs/heads "--format=%(refname:short)"
|
||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE rev_branch
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
endif()
|
||||
|
||||
# if local branch scan didn't find anything, try remote branches
|
||||
if(NOT rev_branch)
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXECUTABLE}" for-each-ref --points-at=HEAD refs/remotes "--format=%(refname:short)"
|
||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE rev_branch
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
endif()
|
||||
|
||||
# give up finding a name for branch, use commit hash
|
||||
if(NOT rev_branch)
|
||||
set(rev_branch ${rev_hash})
|
||||
endif()
|
||||
|
||||
# normalize branch to single line (for-each-ref can output multiple lines if there are multiple branches on the same commit)
|
||||
string(REGEX MATCH "^[^ \t\r\n]+" rev_branch ${rev_branch})
|
||||
endif()
|
||||
|
||||
# Last minute check - ensure that we have a proper revision
|
||||
|
||||
Reference in new issue
Block a user