diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-03 16:44:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-03 16:44:39 (GMT) |
| commit | 8c84b2e468c64639720d5a89eede3e844525bd0a (patch) | |
| tree | ebedcbb2abeea7a4487f74415b4c742aa759c136 | |
| parent | 5e05e6111ebc16b1b072308e8c7a57e2c2362b21 (diff) | |
| parent | bba3d65bb6882ec3d2643fc5de1ce2030a8d2279 (diff) | |
| download | CMake-8c84b2e468c64639720d5a89eede3e844525bd0a.zip CMake-8c84b2e468c64639720d5a89eede3e844525bd0a.tar.gz CMake-8c84b2e468c64639720d5a89eede3e844525bd0a.tar.bz2 | |
Merge topic 'ci-continuous'
bba3d65bb6 ci: add fedora35-ninja build and test jobs in continuous pipeline
e3519aced4 ci: configure rules to enable dependent jbos in continuous pipeline
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7034
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3071055..ea58f9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -274,6 +274,8 @@ b:fedora35-ninja: - .cmake_build_artifacts - .linux_builder_tags_qt - .run_manually + variables: + CMAKE_CI_JOB_CONTINUOUS: "true" b:debian10-makefiles-inplace: extends: @@ -295,6 +297,8 @@ t:fedora35-ninja: - b:fedora35-ninja needs: - b:fedora35-ninja + variables: + CMAKE_CI_JOB_CONTINUOUS: "true" t:fedora35-ninja-multi: extends: diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index a871b8f..9302da4 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -52,6 +52,8 @@ when: on_success - if: '$CMAKE_CI_JOB_NIGHTLY == "true"' when: never + - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true"' + when: on_success - if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)' when: never - if: '$CI_MERGE_REQUEST_ID' |