From 57cad57a84bc5110cf1208af958583ca06d677d7 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Tue, 28 Oct 2025 16:19:16 +1100
Subject: [PATCH] ci: run all jobs in merge queue (#10744)

Trying to be clever as to which jobs to run inside the merge queue doesn't seem to work. Therefore, we now revert to just running all jobs in there.
---
 .github/workflows/ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae6ae9276..eff24a997 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,6 +47,13 @@ jobs:
             exit 0;
           fi
 
+          # For merge group, run all jobs
+          if [ "${{ github.event_name }}" = "merge_group" ]; then
+            echo "jobs_to_run=$jobs" >> "$GITHUB_OUTPUT"
+
+            exit 0;
+          fi
+
           # Fetch base ref for PRs
           if [ "${{ github.event_name }}" = "pull_request" ]; then
             git fetch origin ${{ github.base_ref }} --depth=1
@@ -56,16 +63,6 @@ jobs:
             cat changed_files.txt
           fi
 
-          # Fetch base ref for merge_group
-          if [ "${{ github.event_name }}" = "merge_group" ]; then
-            # Base ref could be a few commits away, so fetch a few commits in case the queue is long
-            git fetch origin ${{ github.event.merge_group.base_ref }} --depth=20
-            git diff --name-only ${{ github.event.merge_group.base_ref }} ${{ github.sha }} > changed_files.txt
-
-            echo "Changed files:"
-            cat changed_files.txt
-          fi
-
           # Run all jobs if CI configuration changes
           if grep -q '^\.github/' changed_files.txt; then
             echo "jobs_to_run=$jobs" >> "$GITHUB_OUTPUT"