Skip to content

Commit 3469c4a

Browse files
committed
don't rebase on canary-branch
Signed-off-by: Jakub Sokołowski <[email protected]>
1 parent eaf3e8d commit 3469c4a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

ci/utils.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ def pkgFilename(type, ext) {
6969

7070
def doGitRebase() {
7171
/* rebasing on relases defeats the point of having a release branch */
72+
if (branchName() == 'canary-branch') {
73+
println 'Skipping rebase for canary build...'
74+
return
75+
}
7276
if (params.BUILD_TYPE == 'release') {
7377
println 'Skipping rebase due to release build...'
7478
return

0 commit comments

Comments
 (0)