don't rebase desktop builds on release either

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-03-21 14:37:08 +01:00
parent 774ad65229
commit 52295502d0
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 6 additions and 3 deletions

View File

@ -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 */

View File

@ -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 {