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'
|
android = load 'ci/android.groovy'
|
||||||
|
|
||||||
def prep(type = 'nightly') {
|
def prep(type = 'nightly') {
|
||||||
if (type != 'release') {
|
utils.doGitRebase()
|
||||||
utils.doGitRebase()
|
|
||||||
}
|
|
||||||
/* ensure that we start from a known state */
|
/* ensure that we start from a known state */
|
||||||
sh 'make clean'
|
sh 'make clean'
|
||||||
/* Run at start to void mismatched numbers */
|
/* Run at start to void mismatched numbers */
|
||||||
|
|
|
@ -48,6 +48,11 @@ def pkgFilename(type, ext) {
|
||||||
}
|
}
|
||||||
|
|
||||||
def doGitRebase() {
|
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 status'
|
||||||
sh 'git fetch --force origin develop:develop'
|
sh 'git fetch --force origin develop:develop'
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in New Issue