diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2020-12-22 23:54:36 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2020-12-23 09:39:50 +0000 |
| commit | 794392ecd77e6fc6aafa62c3f6002780abcc2c7c (patch) | |
| tree | 75bac9e953436f0faf804cfd2a406eeff849588e /.gitlab-ci.yml | |
| parent | a923218e9ba59231fe898f305b91076c32209667 (diff) | |
| download | opus-794392ecd77e6fc6aafa62c3f6002780abcc2c7c.tar.gz | |
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 <giles@thaumas.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files 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 |