Merge pull request #1802 from Kobzol/expected-end-fix

Fix expected date in status page
rust-lang · Jan 15, 2024 · 8b21652 · 8b21652
2 parents e982ff3 + 1954544
commit 8b21652
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/site/frontend/src/pages/status/page.vue b/site/frontend/src/pages/status/page.vue
@@ -181,10 +181,12 @@ const timeline: Ref<TimelineEntry[]> = computed(() => {
     .filter(([_, reason]) => !reason.hasOwnProperty("InProgress"))
     .reverse();
   let queued_before = queued.length - 1;
+  const currentRunEnd =
+    current?.expected_end ?? addSeconds(new Date(), currentTimeLeft);
   for (const [commit, reason] of queued) {
     const expected_end = addSeconds(
-      current?.expected_end ?? new Date(),
-      currentTimeLeft + queued_before * expectedRunDuration
+      currentRunEnd,
+      queued_before * expectedRunDuration + expectedRunDuration
     );
 
     let kind = commit.type;