From c30a2fa607bfe5759934e40229db827dedb39fc1 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Mon, 30 Jul 2018 14:17:34 +0200
Subject: [PATCH] CI: little fix in main python script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 3b1536469e..861e6f3e4e 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -165,7 +165,7 @@ class SSHConnection():
self.command('git checkout -f ' + self.eNBCommitID, '\$', 5)
# if the branch is not develop, then it is a merge request and we need to do
# the potential merge. Note that merge conflicts should already been checked earlier
- if self.eNBBranch != 'develop':
+ if (self.eNBBranch != 'develop') and (self.eNBBranch != 'origin/develop'):
self.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 5)
self.command('source oaienv', '\$', 5)
self.command('cd cmake_targets', '\$', 5)
--
GitLab