diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-01 11:22:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-01 11:22:49 (GMT) |
| commit | c70d083b43e3a0b76e52d7911572ebda1aa0fad9 (patch) | |
| tree | 463d2c624ba53af8fd41b72af60bf617990d56de | |
| parent | 47b569a85852f716b05ede538e9940392407316c (diff) | |
| parent | 4e08ce720b4e55bf75d2fe7e41c04cc2a433ce06 (diff) | |
| download | CMake-c70d083b43e3a0b76e52d7911572ebda1aa0fad9.zip CMake-c70d083b43e3a0b76e52d7911572ebda1aa0fad9.tar.gz CMake-c70d083b43e3a0b76e52d7911572ebda1aa0fad9.tar.bz2 | |
Merge topic 'ci-continuous'
4e08ce720b gitlab-ci: add sphinx job to continuous build
ff72dbfb14 gitlab-ci: configure rules to enable continuous builds of staged MRs
a7afd8d3b0 gitlab-ci: use separate rules for dependent jobs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5304
| -rw-r--r-- | .gitlab-ci.yml | 21 | ||||
| -rw-r--r-- | .gitlab/ci/gitlab_ci.cmake | 6 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 15 |
3 files changed, 33 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c9865e..c4c14bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,9 @@ build:fedora31-sphinx: - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically + variables: + CMAKE_CI_JOB_CONTINUOUS: "true" + CMAKE_CI_JOB_HELP: "true" # Linux builds @@ -101,7 +104,7 @@ test:fedora31-makefiles: - .fedora31_makefiles - .cmake_test_linux_package - .linux_builder_tags_qt - - .run_automatically + - .run_dependent dependencies: - build:centos6-release needs: @@ -112,7 +115,7 @@ test:cuda10.2-nvidia: - .cuda10.2_nvidia - .cmake_test_linux_package - .linux_builder_tags_cuda - - .run_automatically + - .run_dependent dependencies: - build:centos6-release needs: @@ -132,7 +135,7 @@ test:fedora31-ninja: - .cmake_test_linux - .linux_builder_tags_x11 - .cmake_test_artifacts - - .run_automatically + - .run_dependent dependencies: - build:fedora31-ninja needs: @@ -143,7 +146,7 @@ test:fedora31-ninja-multi: - .fedora31_ninja_multi - .cmake_test_linux_external - .linux_builder_tags_qt - - .run_automatically + - .run_dependent dependencies: - test:fedora31-ninja needs: @@ -165,7 +168,7 @@ test:macos-ninja: - .cmake_test_macos - .cmake_test_artifacts - .macos_builder_tags - - .run_automatically + - .run_dependent dependencies: - build:macos-ninja needs: @@ -184,7 +187,7 @@ test:macos-makefiles: - .macos_makefiles - .cmake_test_macos - .macos_builder_tags - - .run_automatically + - .run_dependent dependencies: - build:macos-makefiles needs: @@ -195,7 +198,7 @@ test:macos-xcode: - .macos_xcode - .cmake_test_macos_external - .macos_builder_ext_tags - - .run_automatically + - .run_dependent dependencies: - test:macos-ninja needs: @@ -240,7 +243,7 @@ test:windows-vs2019-x64-ninja: - .cmake_test_windows - .windows_builder_tags - .cmake_test_artifacts - - .run_automatically + - .run_dependent dependencies: - build:windows-vs2019-x64-ninja needs: @@ -251,7 +254,7 @@ test:windows-vs2019-x64: - .windows_vs2019_x64 - .cmake_test_windows_external - .windows_builder_ext_tags - - .run_automatically + - .run_dependent dependencies: - test:windows-vs2019-x64-ninja needs: diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index 7bd9300..7e5a7ab 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.gitlab/ci/gitlab_ci.cmake @@ -49,6 +49,12 @@ endif () set(ctest_track "Experimental") if (NOT "$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "") set(ctest_track "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") + else() + set(ctest_track "Continuous") + endif() elseif ("$ENV{CI_PROJECT_PATH}" STREQUAL "cmake/cmake") if ("$ENV{CI_COMMIT_REF_NAME}" STREQUAL "master") set(ctest_track "master") diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 1803e79..1edfd97 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -4,6 +4,9 @@ rules: - if: '$CMAKE_CI_PACKAGE == "true"' when: never + - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")' + when: delayed + start_in: 5 minutes - if: '$CI_MERGE_REQUEST_ID' when: manual - if: '$CI_PROJECT_PATH == "cmake/cmake"' @@ -15,6 +18,18 @@ rules: - if: '$CMAKE_CI_PACKAGE == "true"' when: never + - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")' + when: on_success + - if: '$CI_MERGE_REQUEST_ID' + when: on_success + - if: '$CI_PROJECT_PATH == "cmake/cmake"' + when: on_success + - when: never + +.run_dependent: + rules: + - if: '$CMAKE_CI_PACKAGE == "true"' + when: never - if: '$CI_MERGE_REQUEST_ID' when: on_success - if: '$CI_PROJECT_PATH == "cmake/cmake"' |