From d997637fa3e52a504bc7aa748329dfdf026924d8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 26 Jan 2021 15:41:43 -0500 Subject: gitlab-ci: add rules infrastructure to allow non-MR jobs --- .gitlab/rules.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.gitlab/rules.yml') diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 5ee8333b63..e8c527d153 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -9,6 +9,8 @@ - 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: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)' + when: never - if: '$CI_MERGE_REQUEST_ID' when: manual - if: '$CI_PROJECT_PATH == "cmake/cmake"' @@ -24,6 +26,8 @@ when: on_success - if: '($CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != "" && $CI_COMMIT_BRANCH == $CMAKE_CI_PROJECT_CONTINUOUS_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' when: on_success - if: '$CI_PROJECT_PATH == "cmake/cmake"' @@ -36,6 +40,8 @@ when: never - if: '$CMAKE_CI_NIGHTLY == "true"' when: on_success + - if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)' + when: never - if: '$CI_MERGE_REQUEST_ID' when: on_success - if: '$CI_PROJECT_PATH == "cmake/cmake"' -- cgit v1.2.1