From 43a64744458dcec82102d6daf488c33b99f24745 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Tue, 16 Mar 2021 17:53:43 +0800 Subject: [ci] don't make marge double build. This fixes !18744 --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd25f5ad6d..b8004f149b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,6 @@ workflow: - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG - if: '$CI_COMMIT_BRANCH == "master"' - - if: '$CI_COMMIT_BRANCH == "wip/marge_bot_batch_merge_job"' - if: '$CI_COMMIT_BRANCH =~ /ghc-[0-9]+\.[0-9]+/' - if: '$CI_PIPELINE_SOURCE == "web"' -- cgit v1.2.1