From 52295502d06652671814c8fd4649532eb03813ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 21 Mar 2019 14:37:08 +0100
Subject: [PATCH] don't rebase desktop builds on release either
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/mobile.groovy | 4 +---
 ci/utils.groovy  | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/mobile.groovy b/ci/mobile.groovy
index c483aa51af..680e27f6a4 100644
--- a/ci/mobile.groovy
+++ b/ci/mobile.groovy
@@ -3,9 +3,7 @@ utils = load 'ci/utils.groovy'
 android = load 'ci/android.groovy'
 
 def prep(type = 'nightly') {
-  if (type != 'release') {
-    utils.doGitRebase()
-  }
+  utils.doGitRebase()
   /* ensure that we start from a known state */
   sh 'make clean'
   /* Run at start to void mismatched numbers */
diff --git a/ci/utils.groovy b/ci/utils.groovy
index 99963c7645..6d6feba47c 100644
--- a/ci/utils.groovy
+++ b/ci/utils.groovy
@@ -48,6 +48,11 @@ def pkgFilename(type, ext) {
 }
 
 def doGitRebase() {
+  /* rebasing on relases defeats the point of having a release branch */
+  if (getBuildType() == 'release') {
+    println 'Skipping rebase due to release build...'
+    return
+  }
   sh 'git status'
   sh 'git fetch --force origin develop:develop'
   try {