Merge branch 'develop' of https://github.com/vector-im/element-web in…

…to t3chguy/playwright-testcontainers # Conflicts: # playwright/e2e/app-loading/guest-registration.spec.ts # playwright/e2e/crypto/dehydration.spec.ts # playwright/e2e/forgot-password/forgot-password.spec.ts # playwright/e2e/login/soft_logout.spec.ts # playwright/e2e/oidc/index.ts # playwright/e2e/register/email.spec.ts # playwright/e2e/register/register.spec.ts # playwright/plugins/homeserver/index.ts # playwright/plugins/homeserver/synapse/index.ts # playwright/plugins/homeserver/synapse/templates/mas-oidc/homeserver.yaml # playwright/plugins/matrix-authentication-service/config.yaml # playwright/plugins/matrix-authentication-service/index.ts
element-hq · Jan 7, 2025 · 96d1812 · 96d1812
2 parents 0410574 + a73faff
commit 96d1812
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/triage-stale-flaky-tests.yml b/.github/workflows/triage-stale-flaky-tests.yml
@@ -1,5 +1,6 @@
 name: Close stale flaky issues
 on:
+    workflow_dispatch: {}
     schedule:
         - cron: "30 1 * * *"
 permissions: {}
@@ -17,3 +18,4 @@ jobs:
                   days-before-close: 0
                   close-issue-message: "This flaky test issue has not been updated in 14 days. It is being closed as presumed resolved."
                   exempt-issue-labels: "Z-Flaky-Test-Disabled"
+                  operations-per-run: 100
diff --git a/scripts/gen-workflow-mermaid.ts b/scripts/gen-workflow-mermaid.ts
@@ -573,7 +573,10 @@ components.forEach((graph) => {
 
                     let variations = cartesianProduct(
                         Object.keys(job.strategy.matrix)
-                            .filter((key) => key !== "include" && key !== "exclude")
+                            .filter(
+                                (key) =>
+                                    key !== "include" && key !== "exclude" && Array.isArray(job.strategy!.matrix[key]),
+                            )
                             .map((matrixKey) => {
                                 return job.strategy!.matrix[matrixKey].map((value) => ({ [matrixKey]: value }));
                             }),