From ce6761a6de9e60d65e7f0c082ef78c68f173c905 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 15 Apr 2018 22:22:32 +0200 Subject: [PATCH] Change: [Jenkinsfile] Set a git user.email and user.name before rebase (#6728) Rebase demands both are set, otherwise it refuses to work --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2fb70d4b41..78672fe683 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,6 +49,10 @@ node { stage("Checkout") { checkout scm + // Ensure user.email and user.name is set, otherwise rebase cannot work + sh "git config user.email 'info@openttd.org'" + sh "git config user.name 'OpenTTD CI'" + // Ensure we also have origin/master available sh "git fetch --no-tags origin master:refs/remotes/origin/master"