Skip to content

Commit 60b0e8b

Browse files
RiotRobotRiotRobot
committed
Merge branch 'master' into develop
2 parents 4730352 + 823828f commit 60b0e8b

File tree

5 files changed

+57
-17
lines changed

5 files changed

+57
-17
lines changed

‎.github/actions/download-verify-element-tarball/action.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,30 @@ inputs:
1010
runs:
1111
using: composite
1212
steps:
13-
- name: Download current version for its old bundles
13+
- name: Download release tarball
1414
id: current_download
1515
uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1
1616
with:
17-
tag: steps.current_version.outputs.version
17+
tag: ${{ inputs.tag }}
1818
fileName: element-*.tar.gz*
1919
out-file-path: ${{ runner.temp }}/download-verify-element-tarball
2020

2121
- name: Verify tarball
22+
shell: bash
2223
run: gpg --verify element-*.tar.gz.asc element-*.tar.gz
2324
working-directory: ${{ runner.temp }}/download-verify-element-tarball
2425

2526
- name: Extract tarball
26-
run: tar xvzf element-*.tar.gz -C webapp --strip-components=1
27+
shell: bash
28+
run: |
29+
mkdir webapp
30+
tar xvzf element-*.tar.gz -C webapp --strip-components=1
2731
working-directory: ${{ runner.temp }}/download-verify-element-tarball
2832

2933
- name: Move webapp to out-file-path
34+
shell: bash
3035
run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }}
3136

3237
- name: Clean up temp directory
38+
shell: bash
3339
run: rm -R ${{ runner.temp }}/download-verify-element-tarball

‎.github/workflows/deploy.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Manual deploy workflow for deploying to app.element.io & staging.element.io
22
# Runs automatically for staging.element.io when an RC or Release is published
33
# Note: Does *NOT* run automatically for app.element.io so that it gets tested on staging.element.io beforehand
4-
name: Build and Deploy ${{ inputs.site || 'staging.element.io' }}
4+
name: Deploy release
5+
run-name: Deploy ${{ github.ref_name }} to ${{ inputs.site || 'staging.element.io' }}
56
on:
67
release:
78
types: [published]
@@ -28,37 +29,39 @@ jobs:
2829
env:
2930
SITE: ${{ inputs.site || 'staging.element.io' }}
3031
steps:
32+
- uses: actions/checkout@v4
33+
3134
- name: Load GPG key
3235
run: |
3336
curl https://packages.element.io/element-release-key.gpg | gpg --import
3437
gpg -k "$GPG_FINGERPRINT"
3538
env:
36-
GPG_FINGERPRINT: ${{ secrets.GPG_FINGERPRINT }}
39+
GPG_FINGERPRINT: ${{ vars.GPG_FINGERPRINT }}
3740

3841
- name: Check current version on deployment
3942
id: current_version
4043
run: |
41-
echo "version=$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT
44+
echo "version=v$(curl -s https://$SITE/version)" >> $GITHUB_OUTPUT
4245
4346
# The current version bundle melding dance is skipped if the version we're deploying is the same
4447
# as then we're just doing a re-deploy of the same version with potentially different configs.
4548
- name: Download current version for its old bundles
4649
id: current_download
4750
if: steps.current_version.outputs.version != github.ref_name
48-
uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }}
51+
uses: ./.github/actions/download-verify-element-tarball
4952
with:
50-
tag: steps.current_version.outputs.version
51-
out-file-path: current_version
53+
tag: ${{ steps.current_version.outputs.version }}
54+
out-file-path: _current_version
5255

5356
- name: Download target version
54-
uses: element-hq/element-web/.github/actions/download-verify-element-tarball@${{ github.ref_name }}
57+
uses: ./.github/actions/download-verify-element-tarball
5558
with:
5659
tag: ${{ github.ref_name }}
5760
out-file-path: _deploy
5861

5962
- name: Merge current bundles into target
6063
if: steps.current_download.outcome == 'success'
61-
run: cp -vnpr current_version/bundles/* _deploy/bundles/
64+
run: cp -vnpr _current_version/bundles/* _deploy/bundles/
6265

6366
- name: Copy config
6467
run: cp element.io/app/config.json _deploy/config.json
@@ -73,7 +76,7 @@ jobs:
7376
uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
7477
with:
7578
ref: ${{ github.sha }}
76-
running-workflow-name: "Build and Deploy ${{ env.SITE }}"
79+
running-workflow-name: "Deploy to Cloudflare Pages"
7780
repo-token: ${{ secrets.GITHUB_TOKEN }}
7881
wait-interval: 10
7982
check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$

‎CHANGELOG.md

+30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
Changes in [1.11.87](https://github.com/element-hq/element-web/releases/tag/v1.11.87) (2024-12-03)
2+
==================================================================================================
3+
## ✨ Features
4+
5+
* Send and respect MSC4230 is\_animated flag ([#28513](https://github.com/element-hq/element-web/pull/28513)). Contributed by @t3chguy.
6+
* Display a warning when an unverified user's identity changes ([#28211](https://github.com/element-hq/element-web/pull/28211)). Contributed by @uhoreg.
7+
* Swap out Twitter link for Mastodon on auth footer ([#28508](https://github.com/element-hq/element-web/pull/28508)). Contributed by @t3chguy.
8+
* Consider `org.matrix.msc3417.call` as video room in create room dialog ([#28497](https://github.com/element-hq/element-web/pull/28497)). Contributed by @t3chguy.
9+
* Standardise icons using Compound Design Tokens ([#28217](https://github.com/element-hq/element-web/pull/28217)). Contributed by @t3chguy.
10+
* Start sending stable `m.marked_unread` events ([#28478](https://github.com/element-hq/element-web/pull/28478)). Contributed by @tulir.
11+
* Upgrade to compound-design-tokens v2 ([#28471](https://github.com/element-hq/element-web/pull/28471)). Contributed by @t3chguy.
12+
* Standardise icons using Compound Design Tokens ([#28286](https://github.com/element-hq/element-web/pull/28286)). Contributed by @t3chguy.
13+
* Remove reply fallbacks as per merged MSC2781 ([#28406](https://github.com/element-hq/element-web/pull/28406)). Contributed by @t3chguy.
14+
* Use React Suspense when rendering async modals ([#28386](https://github.com/element-hq/element-web/pull/28386)). Contributed by @t3chguy.
15+
16+
## 🐛 Bug Fixes
17+
18+
* Add spinner when room encryption is loading in room settings ([#28535](https://github.com/element-hq/element-web/pull/28535)). Contributed by @florianduros.
19+
* Fix getOidcCallbackUrl for Element Desktop ([#28521](https://github.com/element-hq/element-web/pull/28521)). Contributed by @t3chguy.
20+
* Filter out redacted poll votes to avoid crashing the Poll widget ([#28498](https://github.com/element-hq/element-web/pull/28498)). Contributed by @t3chguy.
21+
* Fix force tab complete not working since switching to React 18 createRoot API ([#28505](https://github.com/element-hq/element-web/pull/28505)). Contributed by @t3chguy.
22+
* Fix media captions in bubble layout ([#28480](https://github.com/element-hq/element-web/pull/28480)). Contributed by @tulir.
23+
* Reset cross-signing before backup when resetting both ([#28402](https://github.com/element-hq/element-web/pull/28402)). Contributed by @uhoreg.
24+
* Listen to events so that encryption icon updates when status changes ([#28407](https://github.com/element-hq/element-web/pull/28407)). Contributed by @uhoreg.
25+
* Check that the file the user chose has a MIME type of `image/*` ([#28467](https://github.com/element-hq/element-web/pull/28467)). Contributed by @t3chguy.
26+
* Fix download button size in message action bar ([#28472](https://github.com/element-hq/element-web/pull/28472)). Contributed by @t3chguy.
27+
* Allow tab completing users in brackets ([#28460](https://github.com/element-hq/element-web/pull/28460)). Contributed by @t3chguy.
28+
* Fix React 18 strict mode breaking spotlight dialog ([#28452](https://github.com/element-hq/element-web/pull/28452)). Contributed by @MidhunSureshR.
29+
30+
131
Changes in [1.11.86](https://github.com/element-hq/element-web/releases/tag/v1.11.86) (2024-11-19)
232
==================================================================================================
333
## ✨ Features

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.86",
3+
"version": "1.11.87",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -122,7 +122,7 @@
122122
"maplibre-gl": "^4.0.0",
123123
"matrix-encrypt-attachment": "^1.0.3",
124124
"matrix-events-sdk": "0.0.1",
125-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
125+
"matrix-js-sdk": "34.13.0",
126126
"matrix-widget-api": "^1.10.0",
127127
"memoize-one": "^6.0.0",
128128
"mime": "^4.0.4",

‎yarn.lock

+4-3
Original file line numberDiff line numberDiff line change
@@ -8240,9 +8240,10 @@ [email protected]:
82408240
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
82418241
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
82428242

8243-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
8244-
version "34.12.0"
8245-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/544ac86d2080da8e55d0b727cae826e42600c490"
8243+
[email protected]:
8244+
version "34.13.0"
8245+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.13.0.tgz#5a7a112cc0c9edd3bd58ae9669070dd220912f51"
8246+
integrity sha512-AAU8ZdCawca+7ucQfdcC3LA85OtCTV7QeqcjvKt/ZZhU3xL9VoawuoRQ+4R6H8KZnqyJmT4j7bdeC0jG4qcqLg==
82468247
dependencies:
82478248
"@babel/runtime" "^7.12.5"
82488249
"@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0"

0 commit comments

Comments
 (0)