diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-06 14:12:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-06 14:12:19 (GMT) |
| commit | 6785df1b0623d112d3d4acd1ed1cad20032adf64 (patch) | |
| tree | 47b6103abb63ba773ddf1afd1ad83550ccd1ef3c | |
| parent | 1f795ee40e8e673b8d358cb7ae2b96d69335d158 (diff) | |
| parent | 71665c8cb9ab460dccfaf04ce152ad637760361d (diff) | |
| download | CMake-6785df1b0623d112d3d4acd1ed1cad20032adf64.zip CMake-6785df1b0623d112d3d4acd1ed1cad20032adf64.tar.gz CMake-6785df1b0623d112d3d4acd1ed1cad20032adf64.tar.bz2 | |
Merge topic 'ci-continuous-help'
71665c8cb9 gitlab-ci: Clarify conditions enabling jobs for continuous build of stage
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6091
| -rw-r--r-- | .gitlab/rules.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index ac1bf60..4ac67e8 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -8,7 +8,7 @@ when: on_success - if: '$CMAKE_CI_JOB_NIGHTLY == "true"' when: never - - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")' + - 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: delayed start_in: 5 minutes - if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)' @@ -28,7 +28,7 @@ when: on_success - if: '$CMAKE_CI_JOB_NIGHTLY == "true"' when: never - - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true")' + - 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 |