Skip to content

Commit

Permalink
Don't show merge commits on changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
pietrocaselani committed May 3, 2019
1 parent 052065f commit a9704cb
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions fastlane/Fastfile
Expand Up @@ -88,14 +88,17 @@ platform :ios do
private_lane :get_changelog_as_markdown do
link_to_commit = 'http://github.com/pietrocaselani/CouchTracker/commit/%H'
log_format = "* %s [view commit](#{link_to_commit})"
tag = `git describe --tags --abbrev=0`.chomp
`git log #{tag}...HEAD --pretty=format:"#{log_format}"`.chomp ||= ''
get_changelog_with_format(log_format: log_format)
end

private_lane :get_changelog_clean do
log_format = '* %s'
get_changelog_with_format(log_format: '* %s')
end

private_lane :get_changelog_with_format do |options|
log_format = options[:log_format]
tag = `git describe --tags --abbrev=0`.chomp
`git log #{tag}...HEAD --pretty=format:"#{log_format}"`.chomp ||= ''
`git log #{tag}...HEAD --no-merges --pretty=format:"#{log_format}"`.chomp ||= ''
end

private_lane :bump_build_number do |_options|
Expand Down

0 comments on commit a9704cb

Please sign in to comment.