From c90fe74d9fa5ed71cfe52d95156280e35ff344a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 15 May 2019 16:53:56 +0200 Subject: [PATCH] check also branch name when skipping rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ci/utils.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/utils.groovy b/ci/utils.groovy index d53cce61b3..513cd2b44d 100644 --- a/ci/utils.groovy +++ b/ci/utils.groovy @@ -47,7 +47,7 @@ def doGitRebase() { println 'Skipping rebase for canary build...' return } - if (params.BUILD_TYPE == 'release') { + if (params.BUILD_TYPE == 'release' || branchName().startsWith('release/')) { println 'Skipping rebase due to release build...' return }