Skip to content
Snippets Groups Projects
Verified Commit 9bb6a0be authored by Lars Bilke's avatar Lars Bilke
Browse files

[CI] Use merge request workflow template. 

https://docs.gitlab.com/ee/ci/yaml/#workflowrules-templates
parent b47a5274
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 6 deletions
.gitlab-ci.yml
+ 1
− 6
View file @ 9bb6a0be
...@@ -5,12 +5,6 @@ stages: ...@@ -5,12 +5,6 @@ stages:
- gui - gui
- package - package
workflow:
rules:
- if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == "master"
variables: variables:
# Docker image names # Docker image names
...@@ -23,6 +17,7 @@ variables: ...@@ -23,6 +17,7 @@ variables:
BUILD_PROCESSES: "" # Empty string: builds all processes BUILD_PROCESSES: "" # Empty string: builds all processes
include: include:
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
# extends # extends
- local: '/scripts/ci/extends/defaults.yml' - local: '/scripts/ci/extends/defaults.yml'
- local: '/scripts/ci/extends/template-build-linux.yml' - local: '/scripts/ci/extends/template-build-linux.yml'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment