From 9bb6a0be46ae7ccf37928a132c9ba3360a14336d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 27 May 2020 14:59:36 +0200
Subject: [PATCH] [CI] Use merge request workflow template.

https://docs.gitlab.com/ee/ci/yaml/#workflowrules-templates
---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1ddaeee39c..3467a010b3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,6 @@ stages:
   - gui
   - package
 
-workflow:
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH == "master"
-
 
 variables:
   # Docker image names
@@ -23,6 +17,7 @@ variables:
   BUILD_PROCESSES: "" # Empty string: builds all processes
 
 include:
+  - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
   # extends
   - local: '/scripts/ci/extends/defaults.yml'
   - local: '/scripts/ci/extends/template-build-linux.yml'
-- 
GitLab