fastlane-plugin-semantic_release 1.19.3 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce1113769c465612e01e3881aa8227c5c5bc9f20c91c7ae6cb47b8124a82ac8
-  data.tar.gz: 7330bf213de14b9fc2555c731069f55e78e725205212a2bbb80ca27380cbce0f
+  metadata.gz: 2ca1b0eb20fc15eda85dd48a0e4b6f5aadf4a8ed70fea7e0747d9b7f6eaf305b
+  data.tar.gz: b768e8adae79e696ae6d5ebde4d32e946807f15047d71fba93acc83043e051b2
 SHA512:
-  metadata.gz: 1117593ee5dc4ea4097a6d2c761175977d464d9343a9c40c6f2451b37c053db2e9ef40b673aface8d2b5eb2a44c76e728be0e9fcf390c54d2e5350c56a37e0bc
-  data.tar.gz: b34d3e5504ad75f12f00a57f7f11da35d14a12326a2e2e990d428c6668a6485a71cc964a21f3654976fe26f72880ec78381b0c53c1cd2307f90a82eea9b97b30
+  metadata.gz: 7db91c64c0ca78c7981202f543e898ef035931e3756791b7a60ccb15b451065411e94d32f8c044c18b5fa1f522ef18a3773e189097776238df5314e105c13524
+  data.tar.gz: f3bfa66b06e45476815cbdd39b487ee5ea2418c20795b6fca8f68e12e0d3290802f3a8f8297cd196b37bce1548c0b3e5d1f94eb644597d7016927db45f81d3a4

data/README.md

@@ -139,6 +139,7 @@ is_releasable = analyze_commits(match: 'ios/beta*')
 | `tag_version_match` | Regex to extract the version number from a tag name | `'\d+\.\d+\.\d+'` |
 | `prevent_tag_fallback` | When `true`, don't fall back to `vX.Y.Z` tags if no match is found | `false` |
 | `codepush_friendly` | Commit types considered CodePush-compatible | `['chore', 'test', 'docs']` |
+| `ignore_breaking_changes` | When `true`, breaking changes will not trigger a major version bump | `false` |
 | `show_version_path` | Print the calculated version for each commit | `true` |
 | `debug` | Enable verbose debug logging | `false` |
 
@@ -195,6 +196,7 @@ notes = conventional_changelog(format: 'slack', title: 'Android Alpha')
 | `display_author` | Show the author name for each commit | `false` |
 | `ignore_scopes` | Array of scopes to exclude | `[]` |
 | `include_scopes` | Array of scopes to exclusively include | `[]` |
+| `ignore_breaking_changes` | When `true`, the breaking changes section will not appear in the changelog. Also reads from `lane_context` if set by `analyze_commits` | `false` |
 | `debug` | Enable verbose debug logging | `false` |
 
 ## Examples
@@ -222,6 +224,15 @@ analyze_commits(
 )
 ```
 
+### Ignoring breaking changes
+
+Prevent breaking change markers from triggering major version bumps. The `!` suffix and `BREAKING CHANGE:` in the commit body will be ignored for both version bumping and changelog output:
+
+```ruby
+analyze_commits(match: 'v*', ignore_breaking_changes: true)
+notes = conventional_changelog(format: 'markdown')
+```
+
 ### Plain text changelog for TestFlight
 
 ```ruby

data/lib/fastlane/plugin/semantic_release/actions/analyze_commits.rb

@@ -15,6 +15,7 @@ module Fastlane
       RELEASE_NEXT_VERSION = :RELEASE_NEXT_VERSION
       RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION = :RELEASE_LAST_INCOMPATIBLE_CODEPUSH_VERSION
       CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN = :CONVENTIONAL_CHANGELOG_ACTION_FORMAT_PATTERN
+      RELEASE_IGNORE_BREAKING_CHANGES = :RELEASE_IGNORE_BREAKING_CHANGES
     end
 
     class AnalyzeCommitsAction < Action
@@ -53,12 +54,11 @@ module Fastlane
           }
         end
 
-        # Tag format is v2.3.4-5-g7685948 (see git describe man page)
-        # Strip the git describe suffix (-<count>-g<hash>) to get the tag name
-        tag_name = tag
-        if tag.split('-').length >= 3
-          tag_name = tag.split('-')[0...-2].join('-').strip
-        end
+        # git describe appends -<N>-g<hash> when HEAD is ahead of a tag.
+        # Use a regex to strip this specific suffix rather than splitting on
+        # dashes, which breaks when the tag itself contains dashes (e.g. v1.0.0-beta).
+        tag_name = tag.strip
+        tag_name = tag_name.sub(/-\d+-g[0-9a-f]+$/, '')
         parsed_version = tag_name.match(params[:tag_version_match])
 
         if parsed_version.nil?
@@ -138,6 +138,8 @@ module Fastlane
             ignore_scopes: params[:ignore_scopes]
           )
 
+          commit[:is_breaking_change] = false if params[:ignore_breaking_changes]
+
           next_major, next_minor, next_patch = bump_version(next_major, next_minor, next_patch, commit)
           is_next_version_compatible_with_codepush = false unless commit[:is_codepush_friendly]
 
@@ -153,6 +155,7 @@ module Fastlane
         is_next_version_releasable = Helper::SemanticReleaseHelper.semver_gt(next_version, version)
 
         Actions.lane_context[SharedValues::RELEASE_ANALYZED] = true
+        Actions.lane_context[SharedValues::RELEASE_IGNORE_BREAKING_CHANGES] = params[:ignore_breaking_changes]
         Actions.lane_context[SharedValues::RELEASE_IS_NEXT_VERSION_HIGHER] = is_next_version_releasable
         Actions.lane_context[SharedValues::RELEASE_IS_NEXT_VERSION_COMPATIBLE_WITH_CODEPUSH] = is_next_version_compatible_with_codepush
         Actions.lane_context[SharedValues::RELEASE_LAST_TAG_HASH] = hash
@@ -315,6 +318,13 @@ module Fastlane
             default_value: true,
             type: Boolean,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ignore_breaking_changes,
+            description: "When true, breaking changes will not trigger a major version bump",
+            default_value: false,
+            type: Boolean,
+            optional: true
           )
         ]
       end

data/lib/fastlane/plugin/semantic_release/actions/conventional_changelog.rb

@@ -45,24 +45,17 @@ module Fastlane
         end
 
         params[:order].each do |type|
-          next if commits.none? { |commit| commit[:type] == type }
+          type_commits = commits.select { |commit| commit[:type] == type && !commit[:is_merge] }
+          next if type_commits.empty?
 
           result += "#{style_text(sections[type.to_sym], format, 'heading')}\n"
-
-          commits.each do |commit|
-            next if commit[:type] != type || commit[:is_merge]
-
-            result += "-"
-            result += " #{style_text("#{commit[:scope]}:", format, 'bold')}" unless commit[:scope].nil?
-            result += " #{commit[:subject]}"
-            result += " (#{build_commit_link(commit, commit_url, format)})" if params[:display_links] == true
-            result += " - #{commit[:author_name]}" if params[:display_author]
-            result += "\n"
-          end
+          result += build_scope_lines(type_commits, format, commit_url, params)
           result += "\n"
         end
 
-        if commits.any? { |commit| commit[:is_breaking_change] == true }
+        ignore_breaking = params[:ignore_breaking_changes] || lane_context[SharedValues::RELEASE_IGNORE_BREAKING_CHANGES]
+
+        if !ignore_breaking && commits.any? { |commit| commit[:is_breaking_change] == true }
           result += "#{style_text('BREAKING CHANGES', format, 'heading')}\n"
 
           commits.each do |commit|
@@ -80,6 +73,35 @@ module Fastlane
         result.rstrip!
       end
 
+      def self.build_scope_lines(type_commits, format, commit_url, params)
+        result = ""
+        grouped = type_commits.group_by { |commit| commit[:scope] }
+
+        grouped.each do |scope, scope_commits|
+          if scope.nil? || scope_commits.length == 1
+            scope_commits.each do |commit|
+              result += build_commit_line("-", commit, format, commit_url, params, include_scope: true)
+            end
+          else
+            result += "- #{style_text("#{scope}:", format, 'bold')}\n"
+            scope_commits.each do |commit|
+              result += build_commit_line("  -", commit, format, commit_url, params, include_scope: false)
+            end
+          end
+        end
+
+        result
+      end
+
+      def self.build_commit_line(prefix, commit, format, commit_url, params, include_scope: true)
+        line = prefix
+        line += " #{style_text("#{commit[:scope]}:", format, 'bold')}" if include_scope && !commit[:scope].nil?
+        line += " #{commit[:subject]}"
+        line += " (#{build_commit_link(commit, commit_url, format)})" if params[:display_links] == true
+        line += " - #{commit[:author_name]}" if params[:display_author]
+        "#{line}\n"
+      end
+
       def self.style_text(text, format, style)
         case style
         when "title"
@@ -240,6 +262,13 @@ module Fastlane
             default_value: false,
             type: Boolean,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :ignore_breaking_changes,
+            description: "When true, breaking changes section will not appear in the changelog",
+            default_value: false,
+            type: Boolean,
+            optional: true
           )
         ]
       end

data/lib/fastlane/plugin/semantic_release/helper/semantic_release_helper.rb

@@ -42,7 +42,15 @@ module Fastlane
         codepush_friendly = params[:codepush_friendly]
         pattern = params[:pattern]
 
-        matched = commit_subject.match(pattern)
+        # Detect revert commits: Revert "type(scope): subject"
+        revert_match = commit_subject.match(/^Revert "(.+)"/i)
+        if revert_match
+          inner_subject = revert_match[1]
+          matched = inner_subject.match(pattern)
+        else
+          matched = commit_subject.match(pattern)
+        end
+
         result = {
           is_valid: false,
           subject: commit_subject,
@@ -54,10 +62,11 @@ module Fastlane
 
         type = matched[1].downcase
         result[:is_valid] = true
+        result[:is_revert] = !!revert_match
         result[:type] = type
         result[:scope] = matched[2]
         result[:has_exclamation_mark] = matched[3] == '!'
-        result[:subject] = matched[4]
+        result[:subject] = revert_match ? "revert #{matched[4]}" : matched[4]
 
         if result[:has_exclamation_mark]
           result[:is_breaking_change] = true

data/lib/fastlane/plugin/semantic_release/version.rb

@@ -1 +1 @@
-module Fastlane module SemanticRelease VERSION = "1.19.3" end end
+module Fastlane module SemanticRelease VERSION = "1.22.0" end end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_release
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.22.0
 platform: ruby
 authors:
 - Jiří Otáhal