From 95d79fc32f8dd9e2edadd1bf6890be770da6c683 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 25 Jun 2021 13:26:40 +0200
Subject: [PATCH] Fix merge pipeline
This pipline only runs when merging a merge request.
---
.gitlab-ci.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e73dac6372..af64a4722a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,9 +136,11 @@ FileEndCheck:
.build_and_test: &build_and_test
before_script:
- if [ "$CI_MERGE_REQUEST_PROJECT_PATH" != "computing/cbmroot" ]; then
- - echo "Should not come here"
- - env
- - exit 1
+ - if [ "$CI_PROJECT_PATH" != "computing/cbmroot" ]; then
+ - echo "Should not come here"
+ - env
+ - exit 1
+ - fi
- fi
script:
- echo "export LINUX_FLAVOUR=$OS" >> Dart.cfg
--
GitLab