From c95a1d2629d875575ada384952c2b0f63d3a78ac Mon Sep 17 00:00:00 2001
From: celinval <35149715+celinval@users.noreply.github.com>
Date: Tue, 20 Jan 2026 03:39:29 +0000
Subject: [PATCH 1/2] Upgrade Rust toolchain to nightly-2025-12-04

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index ad3c08879ce..ff15e5e6aad 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2025-12-03"
+channel = "nightly-2025-12-04"
 components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

From e224fb8cb57475dfb48dcb10aa7cd8e49bbb5060 Mon Sep 17 00:00:00 2001
From: "Felipe R. Monteiro" <felisous@amazon.com>
Date: Wed, 1 Apr 2026 18:28:16 -0400
Subject: [PATCH 2/2] Add timeout and retry to perf benchmark workflow

The bench-e2e job runs ~86 minutes on GitHub-hosted runners, making it
vulnerable to spot instance preemption (SIGTERM/exit 143). Add:
- timeout-minutes: 120 to distinguish real timeouts from preemption
- nick-fields/retry@v3 with max_attempts: 2 on the benchcomp step
  so a preempted run is automatically retried

Signed-off-by: Felipe R. Monteiro <felisous@amazon.com>
---
 .github/workflows/bench-e2e.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bench-e2e.yml b/.github/workflows/bench-e2e.yml
index 987420379af..c849c832d04 100644
--- a/.github/workflows/bench-e2e.yml
+++ b/.github/workflows/bench-e2e.yml
@@ -18,6 +18,7 @@ on:
 jobs:
   perf-benchcomp:
     runs-on: ubuntu-24.04
+    timeout-minutes: 120
     steps:
       - name: Save push event HEAD and HEAD~ to environment variables
         if: ${{ github.event_name == 'push' }}
@@ -61,13 +62,17 @@ jobs:
         run: rm -rf ./old/tests/perf ; cp -r ./new/tests/perf ./old/tests/
 
       - name: Run benchcomp
-        run: |
-          new/tools/benchcomp/bin/benchcomp \
-            --config new/tools/benchcomp/configs/perf-regression.yaml \
-            run
-          new/tools/benchcomp/bin/benchcomp \
-            --config new/tools/benchcomp/configs/perf-regression.yaml \
-            collate
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 100
+          max_attempts: 2
+          command: |
+            new/tools/benchcomp/bin/benchcomp \
+              --config new/tools/benchcomp/configs/perf-regression.yaml \
+              run
+            new/tools/benchcomp/bin/benchcomp \
+              --config new/tools/benchcomp/configs/perf-regression.yaml \
+              collate
 
       - name: Perf Regression Results Table
         run: |