diff --git a/Jenkinsfile b/Jenkinsfile index e317738..98f1ceb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 = [