diff --git a/fastlane/Fastfile b/fastlane/Fastfile index feacbfa6..28983f93 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -265,7 +265,7 @@ lane :build_flavor do |params| upload_store(changelog:changelog, version: version, versionCode: versionCode, flavor:flavor, options:options, build_output:build_output) if (platform == 'ios' && options[:github] != false) # we now github create releases on iOS for european users - changelog = get_changelog(platform:platform, flavor:'github') + changelog = get_changelog(platform:platform, flavor:flavor, format:'markdown') set_github_release( repository_name: repository_name, api_token: ENV["GH_TOKEN"], @@ -300,16 +300,19 @@ end lane :get_changelog do |params| platform = params[:platform] flavor = params[:flavor] + changelogFormat = params[:format] || flavor == 'github' ? 'markdown' : 'plain' ignoredScopes = [platform == "ios" ? 'android' : 'ios'] if (ignore_app_scope) ignoredScopes.push(ignore_app_scope) end - display_links = flavor == 'github' + display_links = changelogFormat == 'markdown' puts "get_changelog "+ platform + " "+ flavor puts "tag_prefix "+ tag_prefix + puts "changelogFormat "+ changelogFormat + puts "display_links "+ display_links puts "ignoredScopes "+ ignoredScopes.join(", ") isReleasable = analyze_commits(match: "\"#{tag_prefix}#{platform}/#{flavor}*\"", ignore_scopes: ignoredScopes, debug:true) - logs = conventional_changelog(format: flavor == 'github' ? 'markdown' : 'plain', title: "#{platform.capitalize} Beta", display_title:false, display_links:display_links, display_scopes:false, order:["feat", "fix", "refactor", "perf"], ignore_scopes: ignoredScopes, debug:true ) || "" + logs = conventional_changelog(format: changelogFormat, title: "#{platform.capitalize} Beta", display_title:false, display_links:display_links, display_scopes:false, order:["feat", "fix", "refactor", "perf"], ignore_scopes: ignoredScopes, debug:true ) || "" if (!logs.empty?) logs = logs.split(/[\n]/).uniq translateLogs = logs.select {|v| v =~ /Translated using Weblate/ } diff --git a/tools b/tools index 7b8d92cf..ba75948a 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit 7b8d92cfeb298338dfd35ec1f223cc230370bfe0 +Subproject commit ba75948a8fff98c5c93e00da013d6a12705d5f4c diff --git a/yarn.lock b/yarn.lock index 458dbcce..5aa0c649 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,7 +27,7 @@ __metadata: "@akylas/nativescript-app-tools@file:tools::locator=root-workspace-0b6124%40workspace%3A.": version: 1.0.0 - resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=670c8a&locator=root-workspace-0b6124%40workspace%3A." + resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=1c9c10&locator=root-workspace-0b6124%40workspace%3A." dependencies: "@dotenvx/dotenvx": "npm:1.19.3" "@nativescript-community/fontmin": "npm:0.9.11" @@ -81,7 +81,7 @@ __metadata: typescript: "npm:5.6.3" typescript-eslint: "npm:^8.9.0" webpack-bundle-analyzer: "npm:^4.10.2" - checksum: 325ab5c171ee71e02ca2514c4cfa40e6d7ab70def15557e61d92652b72f71cc952d3e5f246514a9d7b37f915ee5e495becfda290198e3ca91bf2f7e9d89b1b68 + checksum: 671fc9fb7926a4c0f87de62c7b3036da19548f459d0ca6a70b0928b953630e0514aab7e2689d46a6fceff7bc48b9eedf38a030bd48a0d67405cc4278968f438a languageName: node linkType: hard