🐛 Skip published releases past tag

Author: pboling

CHANGELOG.md

@@ -28,6 +28,10 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- `kettle-family release --publish` now skips already-published members even
+  when post-release commits leave HEAD ahead of the release tag, allowing later
+  pending members to continue.
+
 ### Security
 
 ## [1.0.3] - 2026-07-21

lib/kettle/family/workflow.rb

@@ -792,40 +792,26 @@ def already_released_result(member)
         if current_release_head
           stdout = "#{member.name} #{member.version} is already published and current HEAD matches #{tag}; skipping release"
           reason = "already released"
-          skipped = true
-        elsif release_pending?(member)
-          stdout = "#{member.name} #{member.version} is already published, but current HEAD is not #{tag}. " \
-            "Bump the version with `kettle-family bump-version patch --execute --only #{member.name}` before releasing."
-          reason = "published version does not match current HEAD"
-          skipped = false
         else
-          stdout = "#{member.name} #{member.version} is already published and release-state reports no pending release; skipping release"
-          reason = "already released; no pending release"
-          skipped = true
+          stdout = "#{member.name} #{member.version} is already published and current HEAD is newer than #{tag}; skipping release"
+          reason = "already released; current HEAD is newer than release tag"
         end
 
         CommandResult.new(
           member_name: member.name,
           phase: "release_skip",
           command: ["internal", "released-version-check", member.version],
           workdir: member.root,
-          status: skipped ? 0 : 1,
-          success: skipped,
+          status: 0,
+          success: true,
           stdout: stdout,
           stderr: "",
           elapsed_seconds: 0.0,
-          skipped: skipped,
+          skipped: true,
           reason: reason
         )
       end
 
-      def release_pending?(member)
-        results = ReleaseStateCheck.new(members: [member], config: config).results
-        return true unless results.all?(&:ok?)
-
-        results.any? { |result| result.state.fetch("pending_release", true) }
-      end
-
       def release_tag_name(version)
         "v#{version}"
       end

spec/kettle/family/workflow_release_spec.rb

@@ -424,7 +424,7 @@
     expect(results.first.stdout).to include("already published")
   end
 
-  it "fails published-version skips when local HEAD is newer than the release tag" do
+  it "skips already published versions when local HEAD is newer than the release tag" do
     write_release_config(publish_command: [RbConfig.ruby, "-e", "abort 'should not run'"])
     config = Kettle::Family::Config.load(root: @tmpdir)
     member = ready_member("alpha")
@@ -434,35 +434,37 @@
     allow(workflow).to receive(:git_work_tree?).with(member.root).and_return(true)
     allow(workflow).to receive(:git_rev_parse).with(member.root, "refs/tags/v1.0.0^{}").and_return("tag-sha")
     allow(workflow).to receive(:git_rev_parse).with(member.root, "HEAD").and_return("head-sha")
-    allow(workflow).to receive(:release_pending?).with(member).and_return(true)
 
     results = workflow.results
 
     expect(results.map(&:phase)).to eq(["release_skip"])
-    expect(results.first).not_to be_ok
-    expect(results.first.stdout).to include("current HEAD is not v1.0.0")
-    expect(results.first.stdout).to include("bump-version patch --execute --only alpha")
+    expect(results.first).to be_ok
+    expect(results.first.skipped).to be(true)
+    expect(results.first.reason).to eq("already released; current HEAD is newer than release tag")
+    expect(results.first.stdout).to include("current HEAD is newer than v1.0.0")
+    expect(results.first.stdout).not_to include("bump-version")
   end
 
-  it "skips already published versions when release state reports no pending release" do
-    write_release_config(publish_command: [RbConfig.ruby, "-e", "abort 'should not run'"])
+  it "continues release after skipping an already published version whose HEAD moved past the tag" do
+    write_release_config(publish_command: [RbConfig.ruby, "-e", "puts 'publish'"])
     config = Kettle::Family::Config.load(root: @tmpdir)
-    member = ready_member("alpha")
-    workflow = described_class.new(command: "release", config: config, members: [member], execute: true, publish: true)
+    alpha = ready_member("alpha")
+    beta = ready_member("beta")
+    workflow = described_class.new(command: "release", config: config, members: [alpha, beta], execute: true, publish: true)
     allow(workflow).to receive(:prompt_for_gem_signing_password)
     allow(workflow).to receive(:released_version?).with("alpha", "1.0.0").and_return(true)
-    allow(workflow).to receive(:git_work_tree?).with(member.root).and_return(true)
-    allow(workflow).to receive(:git_rev_parse).with(member.root, "refs/tags/v1.0.0^{}").and_return("tag-sha")
-    allow(workflow).to receive(:git_rev_parse).with(member.root, "HEAD").and_return("head-sha")
-    allow(workflow).to receive(:release_pending?).with(member).and_return(false)
+    allow(workflow).to receive(:released_version?).with("beta", "1.0.0").and_return(false)
+    allow(workflow).to receive(:git_work_tree?).with(alpha.root).and_return(true)
+    allow(workflow).to receive(:git_rev_parse).with(alpha.root, "refs/tags/v1.0.0^{}").and_return("tag-sha")
+    allow(workflow).to receive(:git_rev_parse).with(alpha.root, "HEAD").and_return("head-sha")
 
     results = workflow.results
 
-    expect(results.map(&:phase)).to eq(["release_skip"])
-    expect(results.first).to be_ok
-    expect(results.first.skipped).to be(true)
-    expect(results.first.reason).to eq("already released; no pending release")
-    expect(results.first.stdout).to include("no pending release")
+    expect(results.map(&:phase)).to include("release_skip", "check", "release_publish")
+    alpha_skip = results.find { |result| result.member_name == "alpha" && result.phase == "release_skip" }
+    expect(alpha_skip).to be_ok
+    expect(alpha_skip.skipped).to be(true)
+    expect(results.find { |result| result.member_name == "beta" && result.phase == "release_publish" }).to be_ok
   end
 
   it "rediscovers member metadata after each target branch checkout" do