Merge branch 'develop' into germain-gg/25884

matrix-org · Nov 30, 2023 · 1c3d5af · 1c3d5af
2 parents c5c26bc + 890958e
commit 1c3d5af
Show file tree

Hide file tree

Showing 183 changed files with 5,099 additions and 3,751 deletions.
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -17,7 +17,9 @@ on:
                 required: true
                 description: "The name of the github repository to check out and build."
         secrets:
-            CYPRESS_RECORD_KEY:
+            KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_RUST:
+                required: true
+            KNAPSACK_PRO_TEST_SUITE_TOKEN_CYPRESS_LEGACY:
                 required: true
             TCMS_USERNAME:
                 required: true

diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
@@ -6,6 +6,14 @@ on:
         types:
             - completed
 
+    # support calls from other workflows for downstream testing
+    workflow_call:
+        inputs:
+            react-sdk-repository:
+                type: string
+                required: true
+                description: "The name of the github repository to check out and build."
+
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
     cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
@@ -78,7 +86,7 @@ jobs:
                   path: matrix-react-sdk
                   repository: ${{ inputs.react-sdk-repository || github.repository }}
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
                   cache-dependency-path: matrix-react-sdk/yarn.lock
@@ -109,13 +117,15 @@ jobs:
         name: Report results
         needs: tests
         runs-on: ubuntu-latest
+        environment: Netlify
         if: always()
         permissions:
             statuses: write
+            deployments: write
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
 
@@ -146,3 +156,16 @@ jobs:
                   context: ${{ github.workflow }} / end-to-end-tests
                   sha: ${{ github.event.workflow_run.head_sha }}
                   target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+            - name: 📤 Deploy to Netlify
+              uses: matrix-org/netlify-pr-preview@v3
+              with:
+                  path: playwright-report
+                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+                  branch: ${{ github.event.workflow_run.head_branch }}
+                  revision: ${{ github.event.workflow_run.head_sha }}
+                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  site_id: ${{ secrets.NETLIFY_SITE_ID }}
+                  desc: Playwright Report
+                  deployment_env: EndToEndTests
+                  prefix: "e2e-"
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
@@ -24,12 +24,6 @@ jobs:
                       Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
                       Exercise caution. Use test accounts.
 
-            - id: prdetails
-              uses: matrix-org/[email protected]
-              with:
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-
             # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
             # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
             - name: 📥 Download artifact
@@ -39,32 +33,17 @@ jobs:
                   name: previewbuild
                   path: webapp
 
-            - name: ☁️ Deploy to Netlify
-              id: netlify
-              uses: nwtgck/actions-netlify@7a92f00dde8c92a5a9e8385ec2919775f7647352 # v2.1
+            - name: 📤 Deploy to Netlify
+              uses: matrix-org/netlify-pr-preview@v3
               with:
-                  publish-dir: webapp
-                  deploy-message: "Deploy from GitHub Actions"
-                  # These don't work because we're in workflow_run
-                  enable-pull-request-comment: false
-                  enable-commit-comment: false
-                  alias: pr${{ steps.prdetails.outputs.pr_id }}
-              env:
-                  NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-              timeout-minutes: 1
-
-            - name: 🚦 Update deployment status
-              uses: bobheadxi/deployments@88ce5600046c82542f8246ac287d0a53c461bca3 # v1
-              if: always()
-              with:
-                  step: finish
-                  override: false
-                  token: ${{ secrets.GITHUB_TOKEN }}
-                  status: ${{ job.status }}
-                  env: ${{ steps.deployment.outputs.env }}
+                  path: webapp
+                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+                  branch: ${{ github.event.workflow_run.head_branch }}
+                  revision: ${{ github.event.workflow_run.head_sha }}
+                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  site_id: ${{ secrets.NETLIFY_SITE_ID }}
+                  deployment_env: ${{ steps.deployment.outputs.env }}
                   deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-                  env_url: ${{ steps.netlify.outputs.deploy-url }}
                   desc: |
                       Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
                       Exercise caution. Use test accounts.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ on:
 concurrency: ${{ github.workflow }}
 jobs:
     release:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-action.yml@develop
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
         secrets: inherit
         with:
             final: ${{ inputs.mode == 'final' }}

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -101,6 +101,23 @@ jobs:
             - name: Run Linter
               run: "yarn run lint:style"
 
+    workflow_lint:
+        name: "Workflow Lint"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+
+            # Does not need branch matching as only analyses this layer
+            - name: Install Deps
+              run: "yarn install --frozen-lockfile"
+
+            - name: Run Linter
+              run: "yarn lint:workflows"
+
     analyse_dead_code:
         name: "Analyse Dead Code"
         runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -3,14 +3,6 @@
 ![Static Analysis](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/static_analysis.yaml/badge.svg)
 [![Knapsack Pro Parallel CI builds for Cypress Test - Legacy Crypto](https://img.shields.io/badge/Knapsack%20Pro-Parallel%20%2F%20Cypress%20Test%20--%20Legacy%20Crypto-%230074ff)](https://knapsackpro.com/dashboard/organizations/3882/projects/2469/test_suites/3724/builds?utm_campaign=organization-id-3882&utm_content=test-suite-id-3724&utm_medium=readme&utm_source=knapsack-pro-badge&utm_term=project-id-2469)
 [![Knapsack Pro Parallel CI builds for Cypress Test - Rust Crypto](https://img.shields.io/badge/Knapsack%20Pro-Parallel%20%2F%20Cypress%20Test%20--%20Rust%20Crypto-%230074ff)](https://knapsackpro.com/dashboard/organizations/3882/projects/2469/test_suites/3729/builds?utm_campaign=organization-id-3882&utm_content=test-suite-id-3729&utm_medium=readme&utm_source=knapsack-pro-badge&utm_term=project-id-2469)
-
-<!--
-Percy is disabled while we're figuring out https://github.com/vector-im/wat-internal/issues/36
-and https://github.com/vector-im/wat-internal/issues/56. We're hoping to turn it back on or switch
-to an alternative in the future.
-[![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/dfde73bd/matrix-react-sdk)
--->
-
 [![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement-web%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element-web)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=matrix-react-sdk&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=matrix-react-sdk)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=matrix-react-sdk&metric=coverage)](https://sonarcloud.io/summary/new_code?id=matrix-react-sdk)

diff --git a/cypress/e2e/create-room/create-room.spec.ts b/cypress/e2e/create-room/create-room.spec.ts
diff --git a/cypress/e2e/crypto/complete-security.spec.ts b/cypress/e2e/crypto/complete-security.spec.ts
diff --git a/cypress/e2e/crypto/crypto.spec.ts b/cypress/e2e/crypto/crypto.spec.ts
@@ -256,7 +256,6 @@ describe("Cryptography", function () {
     }
 
     it("creating a DM should work, being e2e-encrypted / user verification", function (this: CryptoTestContext) {
-        skipIfRustCrypto(); // https://github.com/vector-im/element-web/issues/25618
         cy.bootstrapCrossSigning(aliceCredentials);
         startDMWithBob.call(this);
         // send first message
@@ -278,7 +277,6 @@ describe("Cryptography", function () {
     });
 
     it("should allow verification when there is no existing DM", function (this: CryptoTestContext) {
-        skipIfRustCrypto(); // https://github.com/vector-im/element-web/issues/26447
         cy.bootstrapCrossSigning(aliceCredentials);
         autoJoin(this.bob);