From d64827fc8a4f49275a389b02368c8994716be843 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 13 Mar 2020 07:51:07 +0100 Subject: [PATCH] fetch branches before master checkout --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e5f88e787f..eb12ebf17f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,10 @@ node('docker') { // commit changes sh "git -c user.name='CES Marvin' -c user.email='cesmarvin@cloudogu.com' commit -m 'release version ${releaseVersion}'" + // we need to fetch all branches, so we can checkout master and develop later + sh "git config 'remote.origin.fetch +refs/heads/*:refs/remotes/origin/*'" + sh "git fetch --all" + // merge release branch into master sh "git checkout master" sh "git merge --ff-only ${env.BRANCH_NAME}"