mirror of
https://github.com/status-im/status-mobile.git
synced 2025-01-13 10:16:01 +00:00
don't rebase desktop builds on release either
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
774ad65229
commit
52295502d0
@ -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 */
|
||||
|
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user