From f8b2ea8ff5848173210ed1d16549b5f2f28bb6c6 Mon Sep 17 00:00:00 2001
From: Mehdi ABAAKOUK <sileht@sileht.net>
Date: Mon, 15 Jun 2026 13:52:20 +0200
Subject: [PATCH] docs(merge-queue): simplify the partial-test-run script
 example

Collapse the three repeated empty-check guards in the GitHub Actions
example into a small `fallback` helper invoked with `||`, so the
fall-back-to-full-suite paths read as one-liners. Behavior is unchanged.

Fixes MRGFY-7613

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Change-Id: I69aaa35ffd3cfbd2d92e798e1e815f2987622f8c
---
 src/content/docs/merge-queue/batches.mdx | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/content/docs/merge-queue/batches.mdx b/src/content/docs/merge-queue/batches.mdx
index 27b9ceb5fd..70068f8ca0 100644
--- a/src/content/docs/merge-queue/batches.mdx
+++ b/src/content/docs/merge-queue/batches.mdx
@@ -478,27 +478,21 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           QUEUE_METADATA: ${{ steps.queue-info.outputs.queue_metadata }}
         run: |
+          # Anything we can't optimize falls back to the full suite.
+          fallback() { echo "$1, running the full test suite."; exit 0; }
+
           # The batch this split came from is the last entry of the list.
           draft_pr=$(jq -r '.previous_failed_batches[-1].draft_pr_number // empty' <<< "$QUEUE_METADATA")
-          if [ -z "$draft_pr" ]; then
-            echo "No previous failed batch: running the full test suite."
-            exit 0
-          fi
+          [ -n "$draft_pr" ] || fallback "No previous failed batch"
 
-          # Find the latest CI run of that batch's draft pull request.
+          # Resolve the latest CI run of that batch's draft pull request.
           sha=$(gh pr view "$draft_pr" --json headRefOid -q .headRefOid)
           run_id=$(gh run list --commit "$sha" --workflow CI --json databaseId -q '.[0].databaseId // empty')
-          if [ -z "$run_id" ]; then
-            echo "No CI run found for the previous failed batch: running the full test suite."
-            exit 0
-          fi
+          [ -n "$run_id" ] || fallback "No CI run for the previous failed batch"
 
           # Download the failing tests it recorded.
-          if gh run download "$run_id" --name failed-tests --dir previous-failed-tests; then
-            echo "tests=$(paste -sd ' ' previous-failed-tests/failed-tests.txt)" >> "$GITHUB_OUTPUT"
-          else
-            echo "No failed-tests artifact found: running the full test suite."
-          fi
+          gh run download "$run_id" --name failed-tests --dir previous-failed-tests || fallback "No failed-tests artifact"
+          echo "tests=$(paste -sd ' ' previous-failed-tests/failed-tests.txt)" >> "$GITHUB_OUTPUT"
 
       - name: Run tests
         env: