Skip to content

Commit e7e1f65

Browse files
authored
Merge pull request #646 from ruby/claude/crossruby-duplicate-logs-637fad
Hide normal builds of servers reporting crossruby
2 parents 626a42e + a9022fc commit e7e1f65

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

app/views/reports/index.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
<tbody>
2020
<% curbr = nil; now = Time.now.to_i %>
21-
<% @cross_reports = []%>
22-
<% @reports.each do |report| %>
21+
<% @cross_reports, reports = @reports.partition {|report| report.depsuffixed_name.start_with?('cross') } %>
22+
<% cross_server_ids = @cross_reports.map(&:server_id).uniq %>
23+
<% reports.each do |report| %>
2324
<%
24-
if report.depsuffixed_name.start_with?('cross')
25-
@cross_reports << report
26-
next
27-
end
25+
# A server reporting crossruby builds sometimes runs normal builds
26+
# by mistake; hide its normal reports while crossruby ones exist.
27+
next if cross_server_ids.include?(report.server_id)
2828
d = now - report.datetime.to_i
2929
style = nil
3030
if @use_opacity && d > 10000

0 commit comments

Comments
 (0)