Просмотр исходного кода

gitlab-ci: use ctest_start GROUP option instead of deprecated TRACK

Brad King 5 лет назад
Родитель
Сommit
0556bd2f8a

+ 1 - 1
.gitlab/ci/ctest_configure.cmake

@@ -6,7 +6,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental TRACK "${ctest_track}")
+ctest_start(Experimental GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)

+ 1 - 1
.gitlab/ci/ctest_test_external.cmake

@@ -7,7 +7,7 @@ set(cmake_args
   -C "${CMAKE_CURRENT_LIST_DIR}/configure_$ENV{CMAKE_CONFIGURATION}.cmake")
 
 # Create an entry in CDash.
-ctest_start(Experimental TRACK "${ctest_track}")
+ctest_start(Experimental GROUP "${ctest_group}")
 
 # Gather update information.
 find_package(Git)

+ 7 - 7
.gitlab/ci/gitlab_ci.cmake

@@ -45,20 +45,20 @@ if (NOT "$ENV{CMAKE_GENERATOR_TOOLSET}" STREQUAL "")
   set(CTEST_CMAKE_GENERATOR_TOOLSET "$ENV{CMAKE_GENERATOR_TOOLSET}")
 endif ()
 
-# Determine the track to submit to.
-set(ctest_track "Experimental")
+# Determine the group to submit to.
+set(ctest_group "Experimental")
 if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
-  set(ctest_track "merge-requests")
+  set(ctest_group "merge-requests")
 elseif (NOT "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "" AND "$ENV{CMAKE_CI_PROJECT_CONTINUOUS_BRANCH}" STREQUAL "$ENV{CI_COMMIT_BRANCH}" AND NOT "$ENV{CMAKE_CI_JOB_CONTINUOUS}" STREQUAL "")
   if (NOT "$ENV{CMAKE_CI_JOB_HELP}" STREQUAL "")
-    set(ctest_track "Continuous Help")
+    set(ctest_group "Continuous Help")
   else()
-    set(ctest_track "Continuous")
+    set(ctest_group "Continuous")
   endif()
 elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake")
   if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master")
-    set(ctest_track "master")
+    set(ctest_group "master")
   elseif ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "release")
-    set(ctest_track "release")
+    set(ctest_group "release")
   endif ()
 endif ()