summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-02 20:02:27 (GMT)
committerBrad King <brad.king@kitware.com>2022-03-02 20:05:19 (GMT)
commite3519aced48eacb72e3dce9662061964f9494adc (patch)
tree57bb9d88d0caab0d93abd41285d9dc248811a2e2 /.gitlab
parent020920e8b5cbbff14323a29d5f7ff51ba2e3cb83 (diff)
downloadCMake-e3519aced48eacb72e3dce9662061964f9494adc.zip
CMake-e3519aced48eacb72e3dce9662061964f9494adc.tar.gz
CMake-e3519aced48eacb72e3dce9662061964f9494adc.tar.bz2
ci: configure rules to enable dependent jbos in continuous pipeline
Apply the rules from commit ff72dbfb14 (gitlab-ci: configure rules to enable continuous builds of staged MRs, 2020-09-30, v3.19.0-rc1~70^2~1) and commit 71665c8cb9 (gitlab-ci: Clarify conditions enabling jobs for continuous build of stage, 2021-05-05, v3.21.0-rc1~218^2) to dependent jobs too.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/rules.yml2
1 files changed, 2 insertions, 0 deletions
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'