diff --git a/.gitignore b/.gitignore index 6153a99..59abb83 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /*.iml app/app.iml .ruby-version +.settings +app/.settings diff --git a/Jenkinsfile b/Jenkinsfile index 4d58588..b86cef2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -126,7 +126,7 @@ } def gitTag(version, remote = 'origin' ) { - sh("git tag -a '${version}' -m 'Create new tag for version ${version}' && git push --dry-run ${remote} ${version}") + sh("git tag -a '${version}' -m 'Create new tag for version ${version}' && git push ${remote} ${version}") } def gitUpdateVersion(versionName, versionCode, remote = 'origin', branch = 'master') { @@ -165,6 +165,7 @@ }, post: { archiveArtifacts(artifacts: 'app/build/outputs/apk/**', allowEmptyArchive: false) + //stash(includes: 'app/build/outputs/apk/*', name: 'apk') }, on: 'android', ] @@ -174,9 +175,11 @@ name = 'release' tasks = [ // if: { (env.BRANCH_NAME == 'master') }, -// pre: { -// unarchive(mapping:['app/build/outputs/apk/' : './app/build/outputs/apk']) -// }, + pre: { + unarchive(mapping:['app/build/outputs/apk/' : '.']) + sh("ls -lA app/build/outputs/apk") + //unstash('apk') + }, run: { def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] def nextVersion = [ name: currentVersion.name, code: currentVersion.code + 1]