Fix support for multiple event types

27e532d is broken, it made it so that if the latest event happens to be (e.g.) a pull request, then nothing is found, because max_items is 1.

Author: oprypin

github_api.cr

@@ -236,11 +236,11 @@ struct WorkflowRuns
     )
   end
 
-  cached_array def self.for_workflow(repo_owner : String, repo_name : String, workflow : String, branch : String, token : InstallationToken | UserToken, max_items : Int32, & : WorkflowRun ->)
+  cached_array def self.for_workflow(repo_owner : String, repo_name : String, workflow : String, branch : String, event : String, token : InstallationToken | UserToken, max_items : Int32, & : WorkflowRun ->)
     # https://docs.github.com/v3/actions#list-workflow-runs
     get_json_list(
       WorkflowRuns, "repos/#{repo_owner}/#{repo_name}/actions/workflows/#{workflow}/runs",
-      params: {branch: branch, status: "success"},
+      params: {branch: branch, event: event, status: "success"},
       headers: {authorization: token}, max_items: max_items
     )
   end

nightly_link.cr

@@ -207,7 +207,12 @@ class DashboardController < ART::Controller
       n += 1
     end
     n.times do
-      installations << ch.receive
+      select
+      when x = ch.receive
+        installations << x
+      when timeout(5.seconds)
+        break
+      end
     end
 
     return ART::StreamedResponse.new(headers: HTML_HEADERS) do |io|
@@ -262,17 +267,39 @@ class DashboardController < ART::Controller
 end
 
 private def get_latest_run(repo_owner : String, repo_name : String, workflow : String, branch : String, token : InstallationToken)
-  artifacts = begin
-    WorkflowRuns.for_workflow(repo_owner, repo_name, workflow, branch, token, max_items: 1, expires_in: 5.minutes)
-  rescue e : Halite::Exception::ClientError
-    if e.status_code.in?(401, 404)
-      raise ART::Exceptions::NotFound.new("Repository '#{repo_owner}/#{repo_name}' or workflow '#{workflow}' not found")
+  ch = Channel(Array(WorkflowRun) | Exception).new
+  {% for event in [{"push", 5}, {"schedule", 60}] %}
+    spawn do
+      ch.send begin
+        WorkflowRuns.for_workflow(repo_owner, repo_name, workflow, branch: branch, event: {{event[0]}}, token: token, max_items: 1, expires_in: {{event[1]}}.minutes)
+      rescue e
+        if e.is_a?(Halite::Exception::ClientError) && e.status_code.in?(401, 404)
+          e = ART::Exceptions::NotFound.new("Repository '#{repo_owner}/#{repo_name}' or workflow '#{workflow}' not found")
+        end
+        e
+      end
     end
-    raise e
+  {% end %}
+
+  runs = Array(WorkflowRun).new
+  exc = nil
+  2.times do
+    select
+    when x = ch.receive
+      case x
+      in Exception
+        exc ||= x
+      in Array
+        runs.concat(x)
+      end
+    when timeout(5.seconds)
+      break
+    end
+  end
+  if runs.empty?
+    raise exc || ART::Exceptions::NotFound.new("No successful runs found for workflow '#{workflow}' and branch '#{branch}'")
   end
-  artifacts.find do |run|
-    run.event.in?("push", "schedule")
-  end || raise ART::Exceptions::NotFound.new("No successful runs found for workflow '#{workflow}' and branch '#{branch}'")
+  runs.max_by &.updated_at
 end
 
 class ArtifactsController < ART::Controller