use CHANGE_TARGET to rebase on actual PR target

Signed-off-by: Jakub Sokołowski <jakub@status.im>
status-im · May 15, 2019 · 4f4cc91 · 4f4cc91
1 parent c90fe74
commit 4f4cc91
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ci/utils.groovy b/ci/utils.groovy
@@ -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