kettle-family 1.2.73 → 1.2.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1dcea43bfc300c3aefd69feccb2b76b532c32999d0f6ef753a8e60018ec50fe
-  data.tar.gz: f03a4dd05afd1a36e431808ab9b654f75d2f5147a6705e678539a183530f1695
+  metadata.gz: 7be7ab5d418e657e0da7272a46b2725e68ff8042a44875edda3f49b0fa5e53d3
+  data.tar.gz: f95c1046814dcec472dd0ef3daf85b471b86c6fde589b9fc8e7fec878aa17159
 SHA512:
-  metadata.gz: 9f75f271224c4e5bf6f10259d576f2b0ca3d8e12fea53a249cf21d154b7fca476491ff13dc58f7c98e6f8681bd212d62f7a82861c0f66a61d107968ac0e19568
-  data.tar.gz: e44c17034b47825c4a9b5ddf7b5769e13bd19cd8d86268752c269e2e15da90138d525c365157f4a4e9e74897b2d8943caecf95c7a1ee3b3418676801391e09ab
+  metadata.gz: 2add7602ea8b5ec1b28ad47aa9e83b6cab6592cc79dd8e7dbf8b233eacc0b0639591abc4731c370be387757a898de8c584e1fba8ad129796d81077aeb253ce3f
+  data.tar.gz: 8cb1a3425743d37a25a023c9ee68c689da44902dc9076e404fab3a7fd76a1b8b2b7a5c1d4bcc8c51fa32570e34936f4b59d4d125137e9b6c0bc6b78ebcb379d3

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.74] - 2026-08-31
+
+- TAG: [v1.2.74][1.2.74t]
+- COVERAGE: 93.32% -- 5548/5945 lines in 33 files
+- BRANCH COVERAGE: 76.73% -- 2279/2970 branches in 33 files
+- 30.50% documented
+
+### Fixed
+
+- Merge configured and generated child release skip steps.
+
 ## [1.2.73] - 2026-08-31
 
 - TAG: [v1.2.73][1.2.73t]
@@ -2381,7 +2392,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.73...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.74...HEAD
+[1.2.74]: https://github.com/kettle-dev/kettle-family/compare/v1.2.73...v1.2.74
+[1.2.74t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.74
 [1.2.73]: https://github.com/kettle-dev/kettle-family/compare/v1.2.72...v1.2.73
 [1.2.73t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.73
 [1.2.72]: https://github.com/kettle-dev/kettle-family/compare/v1.2.71...v1.2.72

data/README.md

@@ -1049,7 +1049,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.931-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.945-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/kettle/family/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.2.73"
+      VERSION = "1.2.74"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -2302,7 +2302,8 @@ module Kettle
         command = replace_kettle_release_provider(command) if @release_secrets_broker
         args = []
         effective_start_step = release_start_step_for(member)
-        effective_skip_steps = release_skip_steps_for(member)
+        command, configured_skip_steps = extract_kettle_release_skip_steps(command)
+        effective_skip_steps = (configured_skip_steps + release_skip_steps_for(member).split(",")).uniq.join(",")
         args << "start_step=#{effective_start_step}" if effective_start_step
         args << "skip_steps=#{effective_skip_steps}" unless effective_skip_steps.empty?
         args << "--skip-changelog" if skip_changelog || aggregate_validation_member?(member)
@@ -2323,6 +2324,27 @@ module Kettle
         command.is_a?(Array) ? [*command, *args] : "#{command} #{args.join(" ")}"
       end
 
+      def extract_kettle_release_skip_steps(command)
+        configured_steps = []
+        case command
+        when Array
+          filtered_command = command.reject do |argument|
+            match = argument.to_s.match(/\A(?:skip_steps|--skip-steps)=(.+)\z/)
+            configured_steps.concat(match[1].split(",")) if match
+            match
+          end
+          [filtered_command, configured_steps.map(&:strip).reject(&:empty?)]
+        when String
+          filtered_command = command.gsub(/(?:\A|\s)(?:skip_steps|--skip-steps)=([^\s]+)/) do
+            configured_steps.concat(Regexp.last_match(1).split(","))
+            ""
+          end
+          [filtered_command.strip, configured_steps.map(&:strip).reject(&:empty?)]
+        else
+          [command, configured_steps]
+        end
+      end
+
       def release_start_step_for(member)
         return start_step unless fast_recovery_for?(member)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.73
+  version: 1.2.74
 platform: ruby
 authors:
 - Peter H. Boling
@@ -441,10 +441,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.73
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.73/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.74
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.74/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.73
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.74
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family