From 6d39e75e5f5c5dd8cbc3ffb9b67cd329931a685b Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 12 Mar 2019 11:24:43 +0100
Subject: [PATCH] CI: fix cmake syntax
---
CI/main_ci.cmake | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake
index e64c213c08..92fb427c3f 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 "")
--
GitLab