From 3c66c2cbd316608d40b12201445fadd89dffc394 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 13 Mar 2024 13:55:44 +0000 Subject: [PATCH] Continue running master and release branch pipelines when we do back-to-back merges --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95b2a517a3..4088024289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,10 @@ workflow: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS when: never + - if: $CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' + # continue running master and release branch pipelines when we do back-to-back merges in case one introduces a regression + auto_cancel: + on_new_commit: none - if: $CI_COMMIT_BRANCH # https://blog.nimbleways.com/let-s-make-faster-gitlab-ci-cd-pipelines/