Skip to content

Commit

Permalink
Fix required status checks on CI / enable merge queue (#1782)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
dokterbob authored Jan 22, 2025
1 parent 4eb2c4b commit fa9dc9e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: CI
on:
workflow_call:
workflow_dispatch:
merge_group:
pull_request:
branches: [main, dev, 'release/**']
push:
Expand All @@ -26,7 +27,12 @@ jobs:
ci:
runs-on: ubuntu-latest
name: Run CI
if: always() # This ensures the job always runs
needs: [lint-backend, pytest, lint-ui, e2e-tests]
steps:
- name: Done
run: echo "Done"
# Propagate failure
- name: Check dependent jobs
if: contains(needs.*.result, 'success') != true || contains(needs.*.result, 'skipped')
run: |
echo "Not all required jobs succeeded"
exit 1
6 changes: 5 additions & 1 deletion .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ jobs:
- name: Run tests
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
run: pnpm test
uses: nick-fields/retry@v3
with:
timeout_minutes: 20
max_attempts: 3
command: pnpm test

0 comments on commit fa9dc9e

Please sign in to comment.