From 628777c64df60e96d6b119f39082df87b2c7c0b7 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 12 Mar 2019 10:00:05 +0100
Subject: [PATCH] CI: adapt the build name
---
CI/main_ci.cmake | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/CI/main_ci.cmake b/CI/main_ci.cmake
index 5f0c1e1a21..5016dd7c77 100644
--- a/CI/main_ci.cmake
+++ b/CI/main_ci.cmake
@@ -26,7 +26,12 @@ set (ENV{LANG} "C") # Only ascii output
set (CTEST_BUILD_CONFIGURATION "Release")
set (CTEST_CMAKE_GENERATOR "Ninja")
-set (CTEST_BUILD_NAME "$ENV{CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}_to_$ENV{CI_MERGE_REQUEST_TARGET_BRANCH_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(("$ENV{CI_COMMIT_REF_NAME}")
+ set (CTEST_BUILD_NAME "${CTEST_BUILD_NAME} ($ENV{CI_COMMIT_SHORT_SHA})")
+endif()
set (CTEST_SITE "${IMAGE_NAME}")
# Directory variable
--
GitLab