From af95756585f2c91c65cebcc49e0a9ef53f2b0680 Mon Sep 17 00:00:00 2001
From: Giorgio Sironi <g.sironi@elifesciences.org>
Date: Fri, 27 Apr 2018 15:56:13 +0100
Subject: [PATCH] Execute merge only on mainline
---
Jenkinsfile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f536ff8..d14d842 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,11 +11,13 @@ elifeLibrary {
elifeLocalTests './project_tests.sh'
}
- stage 'Merge to master', {
- elifeGitMoveToBranch commit, 'master'
- }
+ elifeMainlineOnly {
+ stage 'Merge to master', {
+ elifeGitMoveToBranch commit, 'master'
+ }
- stage 'Downstream', {
- build job: 'dependencies-sciencebeam-update-sciencebeam-gym', wait: false, parameters: [string(name: 'commit', value: commit)]
+ stage 'Downstream', {
+ build job: 'dependencies-sciencebeam-update-sciencebeam-gym', wait: false, parameters: [string(name: 'commit', value: commit)]
+ }
}
}
--
GitLab