kettle-dev 2.1.1 → 2.2.1

data/lib/kettle/dev/ci_monitor.rb

@@ -285,8 +285,13 @@ module Kettle
         total = workflows.size
         abort("No GitHub workflows found under .github/workflows; aborting.") if total.zero?
 
+        head_sha = Kettle::Dev::CIHelpers.current_head_sha
+        abort("Could not determine local HEAD SHA for GitHub Actions checks.") unless head_sha && !head_sha.empty?
+
         passed = {}
+        started = {}
         puts "Ensuring GitHub Actions workflows pass on #{branch} (#{owner}/#{repo}) via remote '#{gh_remote}'"
+        puts "Waiting for GitHub Actions runs to start for HEAD #{head_sha[0, 12]}."
         pbar = if defined?(ProgressBar)
           ProgressBar.create(title: "CI", total: total, format: "%t %b %c/%C", length: 30)
         end
@@ -300,11 +305,15 @@ module Kettle
           end
         end
         sleep((initial_sleep && initial_sleep >= 0) ? initial_sleep : 3)
+        start_timeout = github_start_timeout
+        poll_interval = github_poll_interval
+        start_deadline = monotonic_time + start_timeout
         idx = 0
         loop do
           wf = workflows[idx]
-          run = Kettle::Dev::CIHelpers.latest_run(owner: owner, repo: repo, workflow_file: wf, branch: branch)
+          run = Kettle::Dev::CIHelpers.latest_run(owner: owner, repo: repo, workflow_file: wf, branch: branch, require_head: true, head_sha: head_sha)
           if run
+            started[wf] = true
             if Kettle::Dev::CIHelpers.success?(run)
               unless passed[wf]
                 passed[wf] = true
@@ -317,9 +326,14 @@ module Kettle
             end
           end
           break if passed.size == total
+          if started.size < total && monotonic_time >= start_deadline
+            missing = (workflows - started.keys).join(", ")
+            puts
+            abort("Timed out after #{start_timeout}s waiting for GitHub Actions workflows to start for HEAD #{head_sha[0, 12]}: #{missing}. Confirm GitHub Actions started, then restart this tool from CI validation with: #{restart_hint}")
+          end
 
           idx = (idx + 1) % total
-          sleep(1)
+          sleep(poll_interval)
         end
         pbar&.finish unless pbar&.finished?
         puts "\nAll GitHub workflows passing (#{passed.size}/#{total})."
@@ -327,6 +341,31 @@ module Kettle
       end
       module_function :monitor_github_internal!
 
+      def monotonic_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+      module_function :monotonic_time
+
+      def github_start_timeout
+        seconds = begin
+          Integer(ENV["K_RELEASE_CI_START_TIMEOUT"])
+        rescue
+          nil
+        end
+        (seconds && seconds >= 0) ? seconds : 120
+      end
+      module_function :github_start_timeout
+
+      def github_poll_interval
+        seconds = begin
+          Float(ENV["K_RELEASE_CI_POLL_INTERVAL"])
+        rescue
+          nil
+        end
+        (seconds && seconds >= 0) ? seconds : 1
+      end
+      module_function :github_poll_interval
+
       def monitor_gitlab_internal!(restart_hint:)
         root = Kettle::Dev::CIHelpers.project_root
         gitlab_ci = File.exist?(File.join(root, ".gitlab-ci.yml"))

data/lib/kettle/dev/gem_spec_reader.rb

@@ -25,7 +25,7 @@ module Kettle
         # @option return [String] :gem_name gem name ("" when not derivable)
         # @option return [Gem::Version] :min_ruby minimum Ruby version derived or DEFAULT_MINIMUM_RUBY
         # @option return [String] :homepage homepage string (may be "")
-        # @option return [String] :gh_org GitHub org (falls back to "kettle-rb")
+        # @option return [String] :gh_org GitHub org (falls back to "kettle-dev")
         # @option return [String] :forge_org primary forge org (currently same as gh_org)
         # @option return [String, nil] :funding_org OpenCollective/org handle or nil when not discovered
         # @option return [String, nil] :gh_repo GitHub repo name, if discoverable
@@ -107,8 +107,8 @@ module Kettle
           forge_org = explicit_forge_org || forge_info[:forge_org]
           gh_repo = forge_info[:origin_repo]
           if forge_org.to_s.empty?
-            Kernel.warn("kettle-dev: Could not determine forge org from spec.homepage or git remote.\n  - Ensure gemspec.homepage is set to a GitHub URL or that the git remote 'origin' points to GitHub.\n  - Example homepage: https://github.com/<org>/<repo>\n  - Proceeding with default org: kettle-rb.")
-            forge_org = "kettle-rb"
+            Kernel.warn("kettle-dev: Could not determine forge org from spec.homepage or git remote.\n  - Ensure gemspec.homepage is set to a GitHub URL or that the git remote 'origin' points to GitHub.\n  - Example homepage: https://github.com/<org>/<repo>\n  - Proceeding with default org: kettle-dev.")
+            forge_org = "kettle-dev"
           end
 
           camel = lambda do |s|