Skip to content

Commit

Permalink
don't rebase on canary-branch
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Sokołowski <jakub@status.im>
  • Loading branch information
jakubgs committed May 9, 2019
1 parent eaf3e8d commit 3469c4a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ci/utils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ def pkgFilename(type, ext) {

def doGitRebase() {
/* rebasing on relases defeats the point of having a release branch */
if (branchName() == 'canary-branch') {
println 'Skipping rebase for canary build...'
return
}
if (params.BUILD_TYPE == 'release') {
println 'Skipping rebase due to release build...'
return
Expand Down

0 comments on commit 3469c4a

Please sign in to comment.