Merge tag 'v1.11.30' into sc

* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw * Pick sensible default option for phone country dropdown ([\#10627](matrix-org/matrix-react-sdk#10627)). Fixes element-hq/element-web#3528. * Relate field validation tooltip via aria-describedby ([\#10522](matrix-org/matrix-react-sdk#10522)). Fixes element-hq/element-web#24963. * Handle more completion types in rte autocomplete ([\#10560](matrix-org/matrix-react-sdk#10560)). Contributed by @alunturner. * Show a tile for an unloaded predecessor room if it has via_servers ([\#10483](matrix-org/matrix-react-sdk#10483)). Contributed by @andybalaam. * Exclude message timestamps from aria live region ([\#10584](matrix-org/matrix-react-sdk#10584)). Fixes element-hq/element-web#5696. * Make composer format bar an aria toolbar ([\#10583](matrix-org/matrix-react-sdk#10583)). Fixes element-hq/element-web#11283. * Improve accessibility of font slider ([\#10473](matrix-org/matrix-react-sdk#10473)). Fixes element-hq/element-web#20168 and element-hq/element-web#24962. * fix file size display from kB to KB ([\#10561](matrix-org/matrix-react-sdk#10561)). Fixes element-hq/element-web#24866. Contributed by @NSV1991. * Handle /me in rte ([\#10558](matrix-org/matrix-react-sdk#10558)). Contributed by @alunturner. * bind html with switch for manage extension setting option ([\#10553](matrix-org/matrix-react-sdk#10553)). Contributed by @NSV1991. * Handle command completions in RTE ([\#10521](matrix-org/matrix-react-sdk#10521)). Contributed by @alunturner. * Add room and user avatars to rte ([\#10497](matrix-org/matrix-react-sdk#10497)). Contributed by @alunturner. * Support for MSC3882 revision 1 ([\#10443](matrix-org/matrix-react-sdk#10443)). Contributed by @hughns. * Check profiles before starting a DM ([\#10472](matrix-org/matrix-react-sdk#10472)). Fixes element-hq/element-web#24830. * Quick settings: Change the copy / labels on the options ([\#10427](matrix-org/matrix-react-sdk#10427)). Fixes element-hq/element-web#24522. Contributed by @justjanne. * Update rte autocomplete styling ([\#10503](matrix-org/matrix-react-sdk#10503)). Contributed by @alunturner. * Workaround Squirrel.Mac wedging app restart after failed update check ([\element-hq#629](element-hq#629)). * Fix error about webContents on log out ([\element-hq#627](element-hq#627)). * Fix error when breadcrumb image fails to load ([\element-hq#609](element-hq#609)). * Fix create subspace dialog not working ([\#10652](matrix-org/matrix-react-sdk#10652)). Fixes element-hq/element-web#24882 * Fix multiple accessibility defects identified by AXE ([\#10606](matrix-org/matrix-react-sdk#10606)). * Fix view source from edit history dialog always showing latest event ([\#10626](matrix-org/matrix-react-sdk#10626)). Fixes element-hq/element-web#21859. * #21451 Fix WebGL disabled error message ([\#10589](matrix-org/matrix-react-sdk#10589)). Contributed by @rashmitpankhania. * Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\#10432](matrix-org/matrix-react-sdk#10432)). Contributed by @MadLittleMods. * Fix overflow on auth pages ([\#10605](matrix-org/matrix-react-sdk#10605)). Fixes element-hq/element-web#19548. * Fix incorrect avatar background colour when using a custom theme ([\#10598](matrix-org/matrix-react-sdk#10598)). Contributed by @jdauphant. * Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\#10593](matrix-org/matrix-react-sdk#10593)). * Update setting description to match reality ([\#10600](matrix-org/matrix-react-sdk#10600)). Fixes element-hq/element-web#25106. * Fix no identity server in help & about settings ([\#10563](matrix-org/matrix-react-sdk#10563)). Fixes element-hq/element-web#25077. * Fix: Images no longer reserve their space in the timeline correctly ([\#10571](matrix-org/matrix-react-sdk#10571)). Fixes element-hq/element-web#25082. Contributed by @kerryarchibald. * Fix issues with inhibited accessible focus outlines ([\#10579](matrix-org/matrix-react-sdk#10579)). Fixes element-hq/element-web#19742. * Fix read receipts falling from sky ([\#10576](matrix-org/matrix-react-sdk#10576)). Fixes element-hq/element-web#25081. * Fix avatar text issue in rte ([\#10559](matrix-org/matrix-react-sdk#10559)). Contributed by @alunturner. * fix resizer only work with left mouse click ([\#10546](matrix-org/matrix-react-sdk#10546)). Contributed by @NSV1991. * Fix send two join requests when joining a room from spotlight search ([\#10534](matrix-org/matrix-react-sdk#10534)). Fixes element-hq/element-web#25054. * Highlight event when any version triggered a highlight ([\#10502](matrix-org/matrix-react-sdk#10502)). Fixes element-hq/element-web#24923 and element-hq/element-web#24970. Contributed by @kerryarchibald. * Fix spacing of headings of integration manager on General settings tab ([\#10232](matrix-org/matrix-react-sdk#10232)). Fixes element-hq/element-web#24085. Contributed by @luixxiul.
SchildiChat · Apr 25, 2023 · 7072bb8 · 7072bb8
2 parents 99fc776 + bf5193e
commit 7072bb8
Show file tree

Hide file tree

Showing 77 changed files with 1,113 additions and 3,433 deletions.
diff --git a/...b/ISSUE_TEMPLATE/please-don-t-file-issues-here---use-the-element-web-project.md b/...b/ISSUE_TEMPLATE/please-don-t-file-issues-here---use-the-element-web-project.md
@@ -0,0 +1,10 @@
+---
+name: Please don't file issues here - use the element-web project
+about: Please don't file issues here - use the element-web project
+title: Please don't file issues here - use the element-web project
+labels: ''
+assignees: ''
+
+---
+
+Please don't file issues here - use the [element-web project](https://github.com/vector-im/element-web/issues/)
diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
@@ -41,7 +41,7 @@ on:
                 default: true
 concurrency: ${{ github.workflow }}
 env:
-    R2_BUCKET: "packages-element-io"
+    R2_BUCKET: ${{ vars.R2_BUCKET }}
 jobs:
     prepare:
         uses: ./.github/workflows/build_prepare.yaml
@@ -52,7 +52,6 @@ jobs:
         secrets:
             CF_R2_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
             CF_R2_TOKEN: ${{ secrets.CF_R2_TOKEN }}
-            CF_R2_S3_API: ${{ secrets.CF_R2_S3_API }}
 
     windows_32bit:
         if: github.event_name != 'workflow_dispatch' || inputs.windows_32bit
@@ -140,9 +139,16 @@ jobs:
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-                  R2_URL: ${{ secrets.CF_R2_S3_API }}
+                  R2_URL: ${{ vars.CF_R2_S3_API }}
                   DEPLOYMENT_DIR: ${{ inputs.mode == 'release' && 'desktop' || 'nightly' }}
 
+            - name: Notify packages.element.io of new files
+              uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
+              with:
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  repository: vector-im/packages.element.io
+                  event-type: packages-index
+
     reprepro:
         needs:
             - linux

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -23,8 +23,56 @@ jobs:
         with:
             arch: ${{ matrix.arch }}
 
+    # This allows core contributors to test changes to the dockerbuild image within a pull request
+    linux_docker:
+        name: Linux docker
+        runs-on: ubuntu-latest
+        if: github.event_name == 'pull_request'
+        outputs:
+            docker-image: ${{ steps.docker.outputs.image }}
+        permissions:
+            contents: read
+            packages: write
+        env:
+            REGISTRY: ghcr.io
+            IMAGE_NAME: ${{ github.repository }}-dockerbuild-pr
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: "Get modified files"
+              id: changed_files
+              uses: tj-actions/changed-files@79adacd43ea069e57037edc891ea8d33013bc3da # v35
+              with:
+                  files: |
+                      dockerbuild/*
+            - name: Log in to the Container registry
+              if: steps.changed_files.outputs.any_modified == 'true'
+              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+              with:
+                  registry: ${{ env.REGISTRY }}
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            - id: docker
+              if: steps.changed_files.outputs.any_modified == 'true'
+              run: |
+                  echo "image=$IMAGE:$PR" >> $GITHUB_OUTPUT
+              env:
+                  IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+                  PR: ${{ github.event.pull_request.number }}
+
+            - name: Build and push Docker image
+              if: steps.changed_files.outputs.any_modified == 'true'
+              uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+              with:
+                  context: dockerbuild
+                  push: true
+                  tags: ${{ steps.docker.outputs.image }}
+
     linux:
-        needs: fetch
+        needs:
+            - fetch
+            - linux_docker
         name: Linux
         uses: ./.github/workflows/build_linux.yaml
         strategy:
@@ -33,6 +81,7 @@ jobs:
         with:
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
+            docker-image: ${{ needs.linux_docker.outputs.docker-image }}
 
     macos:
         needs: fetch

diff --git a/.github/workflows/build_keyring.yaml b/.github/workflows/build_keyring.yaml
diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
@@ -20,11 +20,15 @@ on:
                 type: boolean
                 required: false
                 description: "Whether to arrange artifacts in the arrangement needed for deployment, skipping unrelated ones"
+            docker-image:
+                type: string
+                required: false
+                description: "The docker image to use for the build, defaults to ghcr.io/vector-im/element-desktop-dockerbuild"
 jobs:
     build:
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/vector-im/element-desktop-dockerbuild:${{ github.ref_name == 'master' && 'master' || 'develop' }}
+            image: ${{ inputs.docker-image || format('ghcr.io/vector-im/element-desktop-dockerbuild:{0}', github.ref_name == 'master' && 'master' || 'develop') }}
         defaults:
             run:
                 shell: bash
@@ -39,7 +43,7 @@ jobs:
               id: cache
               uses: actions/cache@v3
               with:
-                  key: ${{ runner.os }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
+                  key: ${{ runner.os }}-${{ inputs.docker-image || github.ref_name }}-${{ inputs.sqlcipher }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
                   path: |
                       ./.hak
 

diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml
@@ -22,9 +22,6 @@ on:
             # Required if `nightly` is set
             CF_R2_TOKEN:
                 required: false
-            # Required if `nightly` is set
-            CF_R2_S3_API:
-                required: false
         outputs:
             macos-version:
                 description: "The version string the next macOS Nightly should use, only output for nightly"
@@ -84,8 +81,8 @@ jobs:
               env:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-                  R2_BUCKET: "packages-element-io"
-                  R2_URL: ${{ secrets.CF_R2_S3_API }}
+                  R2_BUCKET: ${{ vars.R2_BUCKET }}
+                  R2_URL: ${{ vars.CF_R2_S3_API }}
 
             - name: Check version
               id: package

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.github/workflows/packages_index.yaml b/.github/workflows/packages_index.yaml