diff --git a/Jenkinsfile b/Jenkinsfile index 1672d7f..eb415c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,7 +98,7 @@ run: { def currentVersion = [ name: android.getVersion('versionName') as String, code: android.getVersion('versionCode') as Integer ] echo("currentVersion = ${currentVersion.toString()}") - lazyGit.withPassword('bot-ci-dgm', { + lazyGitPass('bot-ci-dgm', { // Fork a release branch as requested echo("Git logs since last tag:\n" + gitLog()) sh("git checkout -b release-${env.LAZY_INPUT}") @@ -106,7 +106,7 @@ def nextVersion = [ name: android.getVersion('versionName') as String, code: android.getVersion('versionCode') as Integer ] echo("nextVersion = ${nextVersion.toString()}" ) android.gitUpdateChangelogs(nextVersion.code) - lazyGit.push(releaseFrom['remote'], "release-${env.LAZY_INPUT}") + gitPush(releaseFrom['remote'], "release-${env.LAZY_INPUT}") }) }, on: 'android', @@ -128,12 +128,12 @@ echo("currentVersion = ${currentVersion.toString()}") if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') lazyGit.withPassword('bot-ci-dgm', { - lazyGit.merge( + gitMerge( "${env.BRANCH_NAME}", "${releaseFrom['branch']}", "Merge changes from ${currentVersion['name']}-${currentVersion['code']} back into ${releaseFrom['branch']}" ) - lazyGit.push(releaseFrom['remote'], releaseFrom['branch']) + gitPush(releaseFrom['remote'], releaseFrom['branch']) }) }, on: 'android', @@ -167,14 +167,14 @@ if ( env.DRYRUN != 'true' ) fastlane('android', 'production') */ def currentVersion = [ name: android.getVersion('versionName') as String, code: android.getVersion('versionCode') as Integer ] echo("currentVersion = ${currentVersion.toString()}") - lazyGit.withPassword('bot-ci-dgm', { - lazyGit.merge( + lazyGitPass('bot-ci-dgm', { + gitMerge( "${env.BRANCH_NAME}", "${releaseTo['branch']}", "Merge changes from ${currentVersion['name']}-${currentVersion['code']} into ${releaseTo['branch']}" ) - lazyGit.push(releaseTo['remote'], releaseTo['branch']) - lazyGit.tag("${currentVersion.name}", releaseTo['remote']) + gitPush(releaseTo['remote'], releaseTo['branch']) + gitTag("${currentVersion.name}", releaseTo['remote']) }) }, on: 'android',