From 777ec99e679e0793e75ec0dbdb66d958068342ad Mon Sep 17 00:00:00 2001
From: Marie <51697796+ijreilly@users.noreply.github.com>
Date: Mon, 5 Jan 2026 14:35:55 +0100
Subject: [PATCH] [E2E tests] Fix run E2E tests before merge - attempt #2
 (#16935)

Following [this PR](https://github.com/twentyhq/twenty/pull/16931), this
is another attempt to trigger E2E tests in merge queue.
---
 .github/workflows/ci-front.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml
index 3dc8c6e08ca..98c3bcb2796 100644
--- a/.github/workflows/ci-front.yaml
+++ b/.github/workflows/ci-front.yaml
@@ -351,7 +351,17 @@ jobs:
         if: contains(needs.*.result, 'failure')
         run: exit 1
   ci-e2e-status-check:
-    if: always() && !cancelled()
+    if: always() && !cancelled() && github.event_name != 'merge_group'
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    needs: [changed-files-check-e2e, e2e-test]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
+  ci-e2e-merge-queue-check:
+    if: |
+      always() && !cancelled() && github.event_name == 'merge_group'
     timeout-minutes: 5
     runs-on: ubuntu-latest
     name: ${{ github.event_name == 'merge_group' && 'ci-e2e-merge-queue-check' || 'ci-e2e-status-check' }}