From 63c7e7ca04a9435edf662061bafc8fb3a349aece Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 7 Oct 2020 06:05:57 -0400 Subject: gitlab-ci: factor out ctest_start() model into a variable --- .gitlab/ci/ctest_configure.cmake | 2 +- .gitlab/ci/ctest_test_external.cmake | 2 +- .gitlab/ci/gitlab_ci.cmake | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake index 1c9d040..2682055 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 GROUP "${ctest_group}") +ctest_start("${ctest_model}" 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 1b81da3..9e2d421 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 GROUP "${ctest_group}") +ctest_start("${ctest_model}" GROUP "${ctest_group}") # Gather update information. find_package(Git) diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index 8297514..44ecf5f 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.gitlab/ci/gitlab_ci.cmake @@ -19,6 +19,7 @@ endif () # Set the build metadata. set(CTEST_BUILD_NAME "$ENV{CI_PROJECT_NAME}-$ENV{CMAKE_CONFIGURATION}") set(CTEST_SITE "gitlab-ci") +set(ctest_model "Experimental") # Default to Release builds. if (NOT "$ENV{CMAKE_BUILD_TYPE}" STREQUAL "") -- cgit v0.12