diff options
| author | Patric Stout <truebrain@openttd.org> | 2018-04-15 22:22:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-15 22:22:32 +0200 |
| commit | ce6761a6de9e60d65e7f0c082ef78c68f173c905 (patch) | |
| tree | 661db5dcad26f0d814d38e90fc80f764ea89de90 /Jenkinsfile | |
| parent | 079f774fd78f68ac4b8d8095fe2e1c16c4c3a9ad (diff) | |
| download | openttd-ce6761a6de9e60d65e7f0c082ef78c68f173c905.tar.xz | |
Change: [Jenkinsfile] Set a git user.email and user.name before rebase (#6728)
Rebase demands both are set, otherwise it refuses to work
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 2fb70d4b4..78672fe68 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" |