diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-05 18:15:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-05 19:25:35 (GMT) |
| commit | 71665c8cb9ab460dccfaf04ce152ad637760361d (patch) | |
| tree | d54b8e1fb61d25dafeaffc566a74c8650f656c82 | |
| parent | 41f9486e61026275fcb9f559a6bc0fd36dcc48e6 (diff) | |
| download | CMake-71665c8cb9ab460dccfaf04ce152ad637760361d.zip CMake-71665c8cb9ab460dccfaf04ce152ad637760361d.tar.gz CMake-71665c8cb9ab460dccfaf04ce152ad637760361d.tar.bz2 | |
gitlab-ci: Clarify conditions enabling jobs for continuous build of stage
| -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 |