From 158eed669afaf0cb84ff045df5b3ecfa65ae18a3 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 14 Apr 2018 22:14:10 +0200 Subject: 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 --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) 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 } -- cgit v1.2.3-70-g09d2