use CHANGE_TARGET to rebase on actual PR target
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
c90fe74d9f
commit
4f4cc91b88
|
@ -51,10 +51,14 @@ def doGitRebase() {
|
|||
println 'Skipping rebase due to release build...'
|
||||
return
|
||||
}
|
||||
def rebaseBranch = 'develop'
|
||||
if (CHANGE_TARGET) { /* This is available for PR builds */
|
||||
rebaseBranch = CHANGE_TARGET
|
||||
}
|
||||
sh 'git status'
|
||||
sh 'git fetch --force origin develop:develop'
|
||||
sh "git fetch --force origin ${rebaseBranch}:${rebaseBranch}"
|
||||
try {
|
||||
sh 'git rebase develop'
|
||||
sh "git rebase ${rebaseBranch}"
|
||||
} catch (e) {
|
||||
sh 'git rebase --abort'
|
||||
throw e
|
||||
|
|
Loading…
Reference in New Issue