diff --git a/Jenkinsfile b/Jenkinsfile index 4e1c94c..7eec9aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -144,14 +144,14 @@ def currentVersion = readFile(encoding: 'UTF-8', file: 'version.txt') gitAuth(env.GIT_CRED, { // Define next version based on optional input - // TODO: impelement/import a generic helper for semantic versionning + // TODO: implement/import a generic helper for semantic versionning def nextVersion = null if (env.lazyInput) { nextVersion = env.lazyInput } else { nextVersion = bumpVersion('build', currentVersion) } - // Merge master into release branch + // Merge changes from working branch into release branch gitMerge(workingBranch, releaseBranch) // Bump version and tag the release branch before deploying sh("git checkout ${releaseBranch}")