Merge branch 'develop' of ssh://github.com/element-hq/element-web into t3chguy/monorepo-playwright-common

# Conflicts:
#	pnpm-lock.yaml
This commit is contained in:
Michael Telatynski
2026-04-10 16:41:45 +01:00
71 changed files with 1309 additions and 902 deletions
+2 -2
View File
@@ -18,8 +18,6 @@ on:
push:
# We do not build on push to develop as the merge_group check handles that
branches: [staging, master]
repository_dispatch:
types: [element-web-notify]
# support triggering from other workflows
workflow_call:
@@ -188,6 +186,7 @@ jobs:
uses: element-hq/element-modules/.github/workflows/reusable-playwright-tests.yml@main # zizmor: ignore[unpinned-uses]
with:
webapp-artifact: webapp
reporter: blob
prepare_ed:
name: "Prepare Element Desktop"
@@ -246,6 +245,7 @@ jobs:
needs:
- playwright_ew
- downstream-modules
- prepare_ed
- build_ed_windows
- build_ed_linux
- build_ed_macos