From b67cdba8097ac227be0534d5207459b184afa9d4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 1 Aug 2024 11:56:23 +1000 Subject: [PATCH] CI: avoid duplicate pipelines --- .gitlab-ci.yml | 6 ++++-- .gitlab-ci/ci.template | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5811fa5..1e5d956 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,10 @@ stages: workflow: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH variables: ############################################################################### diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 836a24b..0c8aeb2 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -29,8 +29,10 @@ stages: workflow: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH variables: ###############################################################################