diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-07 10:11:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-07 10:12:05 (GMT) |
| commit | 0556bd2f8a0cb4df6b2aaf157dc598358eef4c83 (patch) | |
| tree | 9a4eac089074ffc5076d477ef8e703a27c1d13ed | |
| parent | 7f031e11308d8a3b6b74c019788d9e7724c52064 (diff) | |
| download | CMake-0556bd2f8a0cb4df6b2aaf157dc598358eef4c83.zip CMake-0556bd2f8a0cb4df6b2aaf157dc598358eef4c83.tar.gz CMake-0556bd2f8a0cb4df6b2aaf157dc598358eef4c83.tar.bz2 | |
gitlab-ci: use ctest_start GROUP option instead of deprecated TRACK
| -rw-r--r-- | .gitlab/ci/ctest_configure.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/ctest_test_external.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/gitlab_ci.cmake | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake index 55cad13..1c9d040 100644 --- a/.gitlab/ci/ctest_configure.cmake +++ b/.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) diff --git a/.gitlab/ci/ctest_test_external.cmake b/.gitlab/ci/ctest_test_external.cmake index b31caa4..1b81da3 100644 --- a/.gitlab/ci/ctest_test_external.cmake +++ b/.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) diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index 7e5a7ab..8297514 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.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 () |