diff --git a/Jenkinsfile b/Jenkinsfile index e317738..4e93623 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,7 +75,7 @@ ], inLabels: [ 'ubuntu-16', 'centos-7' ], onLabels: [ default: 'master', docker: 'docker', mac: 'mac', android: 'android', ], - noPoll: '(releaseBranch|.+_.+)', + noPoll: "(${releaseBranch}|.+_.+)", // Don't poll release and private branches ) lazyStage { @@ -155,7 +155,7 @@ } else { nextVersion = bumpVersion('build', currentVersion) } - // Merge changes from working branch + // Merge changes from working branch into release branch gitMerge(workingBranch, releaseBranch) // Bump version and tag before deploying writeFile(encoding: 'UTF-8', file: 'version.txt', text: nextVersion) @@ -171,6 +171,7 @@ ] } +// Generate packages lazyStage { name = 'package' tasks = [