From 794392ecd77e6fc6aafa62c3f6002780abcc2c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 22 Dec 2020 23:54:36 +0000 Subject: ci: fix pipeline run for merge requests This way CI pipeline runs for branches and tags and makes it show up in merge requests where a branch is used as source branch. Makes all jobs show up in merge request CI indicator (not just the whitespace job) and only runs a single CI pipeline, without the additional detached pipeline. https://docs.gitlab.com/ce/ci/yaml/#workflowrules-templates Signed-off-by: Ralph Giles --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70c243b5..01b033fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +include: + - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' + default: tags: - docker @@ -6,8 +9,6 @@ default: whitespace: stage: test - only: - - merge_requests script: - git diff-tree --check origin/master HEAD -- cgit v1.2.3