From ab76e90cbdc95bc094c942ca17a2da82cab90f98 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Tue, 3 May 2022 16:19:46 +0200 Subject: [PATCH] Add OR to rule --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af8a79cac..fc17cef18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -381,9 +381,8 @@ cppcheck: stage: analyze rules: - - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"' + - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop" || $CI_PIPELINE_SOURCE == "merge_request_event"' - when: manual - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' needs: [] -- GitLab