[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.
This commit is contained in:
Marie
2026-01-05 14:35:55 +01:00
committed by GitHub
parent dffe4c2152
commit 777ec99e67
+11 -1
View File
@@ -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' }}