diff --git a/Jenkinsfile b/Jenkinsfile index 7666ff1..0053233 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,7 +78,7 @@ deployBranches.each { deployBranch -> gitMerge(workingBranch, deployBranch) } - // Go back to working branch for validation + // Go back to working branch for validation sh("git checkout ${lazyConfig['branch']}") fastLane('android', 'test') }, @@ -108,7 +108,7 @@ // Ask version if release flag and set and we are in the branch to fork release from input = [ message: 'Version string', - parameters: [string(defaultValue: '', description: 'Version string to be release (no build number)', name: 'VERSION')] + parameters: [string(defaultValue: '', description: 'Version string to be release NEXT (no build number)', name: 'VERSION')] ] tasks = [ run: { @@ -121,6 +121,12 @@ } gitAuth('bot-ci-dgm', { + // Refresh latest changelogs before releasing + sh("git checkout ${workingBranch}") + fastChangeLogs(nextVersion.number, 'android') + gitCommit("Provide changelogs for version ${currentVersion.number}", 'fastlane/metadata/android') + gitPush(remote, workingBranch) + // Refresh each deploy branches with changes from the working branch deployBranches.each { deployBranch -> gitMerge(workingBranch, deployBranch) @@ -132,13 +138,11 @@ gitTag("${currentVersion.string}-${currentVersion.number}", remote) // Refresh latest changelogs and bump version in working branch before deploying - fastChangeLogs(nextVersion.number, 'android') androidVersion(nextVersion) - gitCommit("Provide changelogs for version ${nextVersion.number}", 'fastlane/metadata/android') gitCommit("Update version to ${nextVersion.string}-${nextVersion.number}", 'app/build.gradle') - // Publish working branch with latest changelogs and next version - gitPush(remote, workingBranch) + // Publish working branch with latest changelogs and next version + gitPush(remote, workingBranch) }) }, on: 'android', @@ -181,20 +185,20 @@ } lazyStage { - name = 'beta_crash' - onlyif = (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE ) - input = 'Promote to Crashlytics Beta users?' - tasks = [ - pre: { - unarchive(mapping:["${buildDir}/" : '.']) - }, - run: { - if ( !lazyConfig.env.DRYRUN ) { - fastLane('android', 'beta_crash', "fl_branch:\"${lazyConfig['branch']}\"") - } - }, - on: 'android', - ] + name = 'beta_crash' + onlyif = (! deployBranches.contains(lazyConfig['branch']) && lazyConfig['branch'] != workingBranch && lazyConfig.env.RELEASE ) + input = 'Promote to Crashlytics Beta users?' + tasks = [ + pre: { + unarchive(mapping:["${buildDir}/" : '.']) + }, + run: { + if ( !lazyConfig.env.DRYRUN ) { + fastLane('android', 'beta_crash', "fl_branch:\"${lazyConfig['branch']}\"") + } + }, + on: 'android', + ] } /* lazyStage { diff --git a/fastlane/metadata/android/en-US/changelogs/70.txt b/fastlane/metadata/android/en-US/changelogs/70.txt deleted file mode 100644 index 098b6f7..0000000 --- a/fastlane/metadata/android/en-US/changelogs/70.txt +++ /dev/null @@ -1,3 +0,0 @@ -- Nothing visible -- Backports from Dappre -- Improves PL \ No newline at end of file diff --git a/fastlane/metadata/android/nl-NL/changelogs/70.txt b/fastlane/metadata/android/nl-NL/changelogs/70.txt deleted file mode 100644 index 2ebc369..0000000 --- a/fastlane/metadata/android/nl-NL/changelogs/70.txt +++ /dev/null @@ -1,3 +0,0 @@ -- Niets zichtbaar -- Backports van Dappre -- Verbeterd PL \ No newline at end of file