From 8e66e719faf9263946e84a28d59323c99eee683d Mon Sep 17 00:00:00 2001 From: Zion Date: Fri, 22 Sep 2017 03:26:43 -0700 Subject: [PATCH] Fix branch name for AppVeyor Builds (#3472) --- rpcs3/git-version.cmake | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake index 4b80bbd2c9..3807f08a38 100644 --- a/rpcs3/git-version.cmake +++ b/rpcs3/git-version.cmake @@ -19,12 +19,17 @@ if(GIT_FOUND AND EXISTS "${SOURCE_DIR}/../.git/") if(NOT ${exit_code} EQUAL 0) message(WARNING "git rev-parse failed, unable to include version.") endif() - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${SOURCE_DIR} - RESULT_VARIABLE exit_code - OUTPUT_VARIABLE GIT_BRANCH) - if(NOT ${exit_code} EQUAL 0) - message(WARNING "git rev-parse failed, unable to include git branch.") + # Hack fix for AppVeyor (Pull Requests don't generate a branch name) + if(NOT DEFINED ENV{APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH}) + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${SOURCE_DIR} + RESULT_VARIABLE exit_code + OUTPUT_VARIABLE GIT_BRANCH) + if(NOT ${exit_code} EQUAL 0) + message(WARNING "git rev-parse failed, unable to include git branch.") + endif() + else() + set(GIT_BRANCH $ENV{APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH}) endif() string(STRIP ${GIT_VERSION} GIT_VERSION) string(STRIP ${GIT_VERSION_} GIT_VERSION_)