Skip to content

Commit fa9dc9e

Browse files
authored
Fix required status checks on CI / enable merge queue (Chainlit#1782)
* Enable merge queue-triggered workflow. * Always run CI job and propagate failure. Helps with required status check and, consequently merge queues. * Attempt auto-retry on E2E tests.
1 parent 4eb2c4b commit fa9dc9e

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/ci.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: CI
33
on:
44
workflow_call:
55
workflow_dispatch:
6+
merge_group:
67
pull_request:
78
branches: [main, dev, 'release/**']
89
push:
@@ -26,7 +27,12 @@ jobs:
2627
ci:
2728
runs-on: ubuntu-latest
2829
name: Run CI
30+
if: always() # This ensures the job always runs
2931
needs: [lint-backend, pytest, lint-ui, e2e-tests]
3032
steps:
31-
- name: Done
32-
run: echo "Done"
33+
# Propagate failure
34+
- name: Check dependent jobs
35+
if: contains(needs.*.result, 'success') != true || contains(needs.*.result, 'skipped')
36+
run: |
37+
echo "Not all required jobs succeeded"
38+
exit 1

.github/workflows/e2e-tests.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@ jobs:
3030
- name: Run tests
3131
env:
3232
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
33-
run: pnpm test
33+
uses: nick-fields/retry@v3
34+
with:
35+
timeout_minutes: 20
36+
max_attempts: 3
37+
command: pnpm test

0 commit comments

Comments
 (0)