gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-31 11:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add: [Jenkinsfile] rebase the pull-request on top of master (#6720)

Browse Source 
This allows PRs to be a bit older, but still validate the correct result
This commit is contained in:
Patric Stout 2018-04-14 22:14:10 +02:00 committed by GitHub
parent bd18951db1
commit 158eed669a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -52,6 +52,9 @@ node {
// Ensure we also have origin/master available // Ensure we also have origin/master available
sh "git fetch --no-tags origin master:refs/remotes/origin/master" sh "git fetch --no-tags origin master:refs/remotes/origin/master"
// Try to rebase to origin/master; if this fails, fail the CI
sh "git rebase origin/master"
stash name: "source", useDefaultExcludes: false stash name: "source", useDefaultExcludes: false
} }