diff --git a/app/libs/queries/release_summary.rb b/app/libs/queries/release_summary.rb index 268e9bd4a..4e572d44d 100644 --- a/app/libs/queries/release_summary.rb +++ b/app/libs/queries/release_summary.rb @@ -107,7 +107,7 @@ class Queries::ReleaseSummary::StepsSummary def self.from_release(release) attributes = release.release_platform_runs.map do |pr| pr.steps.map do |step| - step_runs = pr.step_runs_for(step) + step_runs = pr.step_runs_for(step).sequential started_at = step_runs.first&.scheduled_at ended_at = step_runs.last&.updated_at { diff --git a/app/models/commit.rb b/app/models/commit.rb index 2947a9caa..1fae098b4 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -78,7 +78,7 @@ def short_sha end def step_runs_for(platform_run) - step_runs.where(release_platform_run: platform_run).includes(:step).order(:created_at) + step_runs.where(release_platform_run: platform_run).includes(:step) end def applied_at diff --git a/app/models/release_platform_run.rb b/app/models/release_platform_run.rb index 5335674fd..849dc8171 100644 --- a/app/models/release_platform_run.rb +++ b/app/models/release_platform_run.rb @@ -227,7 +227,7 @@ def running_step? def last_run_for(step) return if last_commit.blank? - last_commit.step_runs_for(self).where(step: step).last + last_commit.step_runs_for(self).where(step: step).sequential.last end def current_step_number