kettle-dev 2.5.24 → 2.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119fe7d1c6923ff7b6346227be82824749480eb1213c26ccaf1f98beee0abffa
-  data.tar.gz: 073cc235f8e053b5026695bcdc6bbe868f535390ca43c6af21c36ce4bf7e40e2
+  metadata.gz: 56ce68001beed714f8b15c44336ffe111f1509dfffd9a7063b1bb50f0580fc08
+  data.tar.gz: 3088a81db9f6327c55fe9113f45be1768f734d2c8b05cfd0c5a55080450de63f
 SHA512:
-  metadata.gz: 80fc5404d8bb8c63decd50c47b15fa25643c254c97f6d2b9ac85ac30b6b1f1363243e3c1596736d14025e5fd29bb8c82962cd0e57afb0971de056ef4f2fed0a8
-  data.tar.gz: 0f0c44cbeabdc6071b567d27781e04371100f0af28dfe09e02c7b1810d76d088eabf23441345f8df90434ca2bd0f79bf7470abee0988e328d470dfae955fd923
+  metadata.gz: e9ad45713716d0583fc83e302ea574a67a7855757efc7abf9de24764abd5d66388056677a74a6fbf67a6d05894b4e7edb813c8e9919ddcdb61b03ed694bd70e2
+  data.tar.gz: 7aa96f4e87ddb6e6b0d41b19e43c56229cca35dbf470313b50f15c6a35124e4e171383c666766ad6a9a937bf3cc6d496df9be5dd71213647ebb2768937852b8f

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.5.25] - 2026-08-07
+
+- TAG: [v2.5.25][2.5.25t]
+- COVERAGE: 91.48% -- 5465/5974 lines in 47 files
+- BRANCH COVERAGE: 75.95% -- 2059/2711 branches in 47 files
+- 50.90% documented
+
+### Fixed
+
+- Select the most recent GitHub Actions build when multiple runs exist for the same commit.
+
 ## [2.5.24] - 2026-08-07
 
 - TAG: [v2.5.24][2.5.24t]
@@ -3324,7 +3335,9 @@ Please file a bug if you notice a violation of semantic versioning.
   - Selecting will run the selected workflow via `act`
   - This may move to its own gem in the future.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.24...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.25...HEAD
+[2.5.25]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.24...v2.5.25
+[2.5.25t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.5.25
 [2.5.24]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.23...v2.5.24
 [2.5.24t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.5.24
 [2.5.23]: https://github.com/kettle-dev/kettle-dev/compare/v2.5.22...v2.5.23

data/README.md

@@ -1007,7 +1007,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.970-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.974-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-dev/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/dev/ci_helpers.rb

@@ -106,14 +106,14 @@ module Kettle
         # Scope to the exact commit SHA when available to avoid picking up a previous run on the same branch.
         sha = head_sha || current_head_sha
         data = github_get_json(
-          "https://api.github.com/repos/#{owner}/#{repo}/actions/workflows/#{workflow_file}/runs?branch=#{URI.encode_www_form_component(b)}&per_page=5",
+          "https://api.github.com/repos/#{owner}/#{repo}/actions/workflows/#{workflow_file}/runs?branch=#{URI.encode_www_form_component(b)}&per_page=100",
           token: token
         )
         return unless data
 
         runs = Array(data["workflow_runs"]) || []
-        # Try to match by head_sha first; GitHub may return a cancelled duplicate
-        # before the replacement run created by workflow concurrency.
+        # Match by head_sha first. There may be multiple builds for one commit;
+        # always select the most recent build rather than trusting API order.
         run = if sha
           match = preferred_head_run(runs.select { |r| r["head_sha"] == sha })
           match ||= latest_repository_workflow_run(owner: owner, repo: repo, workflow_file: workflow_file, branch: b, head_sha: sha, token: token)
@@ -150,11 +150,17 @@ module Kettle
         )
       end
 
-      # Concurrency cancellation can leave an older run for the exact same
-      # commit ahead of its replacement in GitHub's API response. Prefer the
-      # replacement so a cancelled duplicate cannot mask a valid run.
+      # GitHub can return multiple builds for the same commit, including an
+      # older failed run before a later retry. Select by run recency so an old
+      # conclusion cannot mask the newest build. `updated_at` also matters for
+      # reruns, which retain the original run's creation timestamp.
       def preferred_head_run(runs)
-        runs.find { |run| run["conclusion"] != "cancelled" } || runs.first
+        runs.max_by do |run|
+          created_at = run["created_at"].to_s
+          updated_at = run["updated_at"].to_s
+          effective_at = [created_at, updated_at].max
+          [effective_at, run["run_number"].to_i, run["run_attempt"].to_i, run["id"].to_i]
+        end
       end
 
       def github_get_json(url, token:)

data/lib/kettle/dev/version.rb

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

metadata

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