From 7f3e62739d30d064d0ef43a530d6659f2e61b800 Mon Sep 17 00:00:00 2001 From: Antoine van der Lee Date: Wed, 19 Jan 2022 13:49:47 +0100 Subject: [PATCH] Reuse changelog created at release --- Fastlane/deployment_lanes.rb | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Fastlane/deployment_lanes.rb b/Fastlane/deployment_lanes.rb index 4dce2838..b85490d6 100644 --- a/Fastlane/deployment_lanes.rb +++ b/Fastlane/deployment_lanes.rb @@ -2,6 +2,7 @@ require 'spaceship' require 'uri' +require 'json' desc 'Creates a new release candidate' desc '' @@ -59,14 +60,15 @@ # Create a new GitHub release last_non_candidate_tag = latest_github_non_candidate_tag release_title = "#{tag_name} - App Store Release Candidate" - release_output = sh("gitbuddy release -l #{last_non_candidate_tag} -b develop --skip-comments --use-pre-release --target-commitish develop --tag-name #{tag_name} --release-title '#{release_title}'") - release_url = URI.extract(release_output).find { |url| url.include? 'releases/tag' } - puts "Created release with URL: #{release_url}" + release_output = sh("gitbuddy release -l #{last_non_candidate_tag} -b develop --skip-comments --json --use-pre-release --target-commitish develop --tag-name #{tag_name} --release-title '#{release_title}'") + release_json = JSON.parse(release_output) - # Create the change log - changelog = sh("gitbuddy changelog -b develop -s #{last_non_candidate_tag}") + release_url = release_json['url'] + changelog = release_json['changelog'] stripped_changelog = strip_markdown_url(input: changelog) + puts "Created release with URL: #{release_url}" + begin testflight( beta_app_review_info: { @@ -164,13 +166,15 @@ release_latest_tag = is_hotfix ? latest_release_tag : last_non_candidate_tag release_base_branch = is_hotfix ? 'main' : 'develop' - release_output = sh("gitbuddy release -l #{release_latest_tag} -b #{release_base_branch} -c '../Changelog.md' --target-commitish #{target_commitish} --tag-name #{tag_name} --release-title '#{release_title}' --verbose") - release_url = URI.extract(release_output).find { |url| url.include? 'releases/tag' } - puts "Created release with URL: #{release_url}" + release_output = sh("gitbuddy release -l #{release_latest_tag} -b #{release_base_branch} -c '../Changelog.md' --target-commitish #{target_commitish} --tag-name #{tag_name} --release-title '#{release_title}' --verbose --json") + release_json = JSON.parse(release_output) - changelog = sh("gitbuddy changelog -b #{release_base_branch} -s #{release_latest_tag}") + release_url = release_json['url'] + changelog = release_json['changelog'] stripped_changelog = strip_markdown_url(input: changelog) + puts "Created release with URL: #{release_url}" + # Push the updated changelog. sh('git commit -a -m "Created a new release"') sh("git push origin #{branch_name}")