diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake index e64c213c0877333bdaaab0417546d4dda07b92ef..92fb427c3fded046e52b1506abac912f09caf076 100644 --- a/CI/main_ci.cmake +++ b/CI/main_ci.cmake @@ -26,12 +26,17 @@ set (ENV{LANG} "C") # Only ascii output set (CTEST_BUILD_CONFIGURATION "Release") set (CTEST_CMAKE_GENERATOR "Ninja") +# Find the build name +set(ci_mr_source "$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}") +set(ci_mr_target "$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}") +set(ci_ref_name "$ENV{CI_COMMIT_REF_NAME}") set (CTEST_BUILD_NAME "$ENV{CI_COMMIT_SHORT_SHA}") -if("$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" AND "$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME}") - set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ($ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} to $ENV{CI_MERGE_REQUEST_TARGET_BRANCH_NAME})") -elseif(CI_COMMIT_REF_NAME) - set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ($ENV{CI_COMMIT_REF_NAME})") +if(ci_mr_source AND ci_mr_target) + set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_mr_source} to ${ci_mr_target})") +elseif(ci_ref_name) + set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} (${ci_ref_name})") endif() + set (CTEST_SITE "${IMAGE_NAME}") # Directory variable @@ -48,8 +53,6 @@ set (OTB_DATA_ROOT "${OTB_SOURCE_DIR}/otb-data/") # todo set (OTB_LARGEINPUT_ROOT "") # todo message(STATUS "CI profile : $ENV{OTB_CI_PROFILE}") -message(STATUS "CI_COMMIT_REF_NAME : $ENV{CI_COMMIT_REF_NAME}") -message(STATUS "CTEST_BUILD_NAME : ${CTEST_BUILD_NAME}") #The following file set the CONFIGURE_OPTIONS variable set (CONFIGURE_OPTIONS "")