diff --git a/Jenkinsfile b/Jenkinsfile index ed8b94f..4d58588 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -121,7 +121,7 @@ git checkout --quiet ${branch} git add ${lDir}/*/changelogs/${versionCode}.txt git commit --quiet -s -m 'Provide changelogs for this version' ${lDir} -git push --dry-run ${remote} ${branch} +git push ${remote} ${branch} """) } @@ -142,7 +142,7 @@ || { echo 'Nothing to update'; exit 0; } git checkout --quiet ${branch} git commit --quiet -s -m 'Update version from ${gName[2]}-${gCode[2]} to ${versionName}-${versionCode}' app/build.gradle -git push --dry-run ${remote} ${branch} +git push ${remote} ${branch} """) } @@ -173,19 +173,18 @@ lazyStage { name = 'release' tasks = [ -// if: { (env.BRANCH_NAME == 'master') }, +// if: { (env.BRANCH_NAME == 'master') }, // pre: { // unarchive(mapping:['app/build/outputs/apk/' : './app/build/outputs/apk']) // }, run: { def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] def nextVersion = [ name: currentVersion.name, code: currentVersion.code + 1] - echo("currentVersion = ${currentVersion.toString()}") - echo("nextVersion = ${nextVersion.toString()}") + echo("currentVersion = ${currentVersion.toString()} / nextVersion = ${nextVersion.toString()}") withGitPassword('bot-ci-dgm', { echo("Git logs since last tag:\n" + gitLog()) prepareChangelogs(currentVersion.code) - //fastlane('android', 'release') + fastlane('android', 'release') gitUpdateChangelogs(currentVersion.code) gitTag("${currentVersion.name}-${currentVersion.code}") gitUpdateVersion(nextVersion.name, nextVersion.code)