Merge branch 'develop' into renovate/typescript

This commit is contained in:
Michael Telatynski 2024-04-30 16:19:45 +01:00 committed by GitHub
commit ac20fffb40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,9 +16,6 @@ concurrency:
jobs: jobs:
playwright: playwright:
name: Playwright name: Playwright
# We only want to run the playwright tests on merge queue to prevent regressions
# from creeping in. They take a long time to run and consume multiple concurrent runners.
if: github.event_name == 'merge_group'
uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
permissions: permissions:
actions: read actions: read
@ -26,3 +23,6 @@ jobs:
pull-requests: read pull-requests: read
with: with:
react-sdk-repository: matrix-org/matrix-react-sdk react-sdk-repository: matrix-org/matrix-react-sdk
# We only want to run the playwright tests on merge queue to prevent regressions
# from creeping in. They take a long time to run and consume multiple concurrent runners.
skip: ${{ github.event_name != 'merge_group' }}