diff --git a/Jenkinsfile b/Jenkinsfile index 348b369..420c63c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -195,7 +195,7 @@ name = 'validate' tasks = [ run: { - fastlane('android', 'test') + fastlane('android', 'test') }, on: 'android', ] @@ -223,10 +223,11 @@ sh("ls -lA 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()} / nextVersion = ${nextVersion.toString()}") withGitPassword('bot-ci-dgm', { + sh("git pull ${release['remote']} ${release['branch']}") + 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()} / nextVersion = ${nextVersion.toString()}") if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') gitTag("${currentVersion.name}-${currentVersion.code}") gitUpdateVersion(nextVersion.name, nextVersion.code, release['remote'], release['branch']) diff --git a/app/build.gradle b/app/build.gradle index 033c96a..0db3b02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ applicationId "nl.digital_me.dummyandroidapp" minSdkVersion 14 targetSdkVersion rootProject.ext.compileSdkVersion - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 29 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 30 versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.1" multiDexEnabled true }