diff options
author | Patric Stout <truebrain@openttd.org> | 2018-04-14 22:14:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-14 22:14:10 +0200 |
commit | 158eed669afaf0cb84ff045df5b3ecfa65ae18a3 (patch) | |
tree | dfee68531632e31aab7fb79cd71820e3257ad147 /Jenkinsfile | |
parent | bd18951db1438912fb89a6b41d6cd540e06ab646 (diff) | |
download | openttd-158eed669afaf0cb84ff045df5b3ecfa65ae18a3.tar.xz |
Add: [Jenkinsfile] rebase the pull-request on top of master (#6720)
This allows PRs to be a bit older, but still validate the correct result
Diffstat (limited to 'Jenkinsfile')
-rw-r--r-- | Jenkinsfile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 095425a73..2fb70d4b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,6 +52,9 @@ node { // Ensure we also have origin/master available 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 } |