-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v1.11.5' into upgrade/element-web-v1.11.5
* Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](matrix-org/matrix-react-sdk#9228)). Contributed by @kerryarchibald. * Device manager - scroll to filtered list from security recommendations ([\#9227](matrix-org/matrix-react-sdk#9227)). Contributed by @kerryarchibald. * Device manager - updated dropdown style in filtered device list ([\#9226](matrix-org/matrix-react-sdk#9226)). Contributed by @kerryarchibald. * Device manager - device type and verification icons on device tile ([\#9197](matrix-org/matrix-react-sdk#9197)). Contributed by @kerryarchibald. * Description of DM room with more than two other people is now being displayed correctly ([\#9231](matrix-org/matrix-react-sdk#9231)). Fixes #23094. * Fix voice messages with multiple composers ([\#9208](matrix-org/matrix-react-sdk#9208)). Fixes #23023. Contributed by @grimhilt. * Fix suggested rooms going missing ([\#9236](matrix-org/matrix-react-sdk#9236)). Fixes #23190. * Fix tooltip infinitely recursing ([\#9235](matrix-org/matrix-react-sdk#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077. * Fix plain text export saving ([\#9230](matrix-org/matrix-react-sdk#9230)). Contributed by @jryans. * Add missing space in SecurityRoomSettingsTab ([\#9222](matrix-org/matrix-react-sdk#9222)). Contributed by @gefgu. * Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](matrix-org/matrix-react-sdk#9209)). Fixes #21369. * Fix progress bar regression throughout the app ([\#9219](matrix-org/matrix-react-sdk#9219)). Fixes #23121. * Reuse empty string & space string logic for event types in devtools ([\#9218](matrix-org/matrix-react-sdk#9218)). Fixes #23115.
- Loading branch information
Showing
14 changed files
with
967 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,8 +36,21 @@ jobs: | |
| SENTRY_ORG: element | ||
| SENTRY_PROJECT: riot-web | ||
|
|
||
| - run: mv dist/element-*.tar.gz webapp.tar.gz | ||
|
|
||
| - run: mv dist/element-*.tar.gz dist/develop.tar.gz | ||
|
|
||
| # We keep the latest develop.tar.gz as the artifact uploaded later expires after 24 and requires auth to download | ||
| # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies. | ||
| - name: Deploy develop.tar.gz to Github Pages | ||
| uses: JamesIves/github-pages-deploy-action@v4 | ||
| with: | ||
| folder: dist | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: webapp | ||
| path: dist/develop.tar.gz | ||
| retention-days: 1 | ||
|
|
||
| - name: Wait for other steps to succeed | ||
| uses: lewagon/[email protected] | ||
| with: | ||
|
|
@@ -46,9 +59,3 @@ jobs: | |
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| wait-interval: 10 | ||
| check-regexp: ^((?!SonarQube|issues|board).)*$ | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: webapp | ||
| path: webapp.tar.gz | ||
| retention-days: 1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,12 +115,12 @@ jobs: | |
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc1HvQ" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| move_voice-message_issues: | ||
| name: A-Voice Messages to voice message board | ||
| Search_issues_to_board: | ||
| name: Search issues to project board | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Voice Messages') | ||
| contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| with: | ||
|
|
@@ -136,14 +136,14 @@ jobs: | |
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc2KCw" | ||
| PROJECT_ID: "PN_kwDOAM0swc4ADtaO" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| move_threads_issues: | ||
| name: A-Threads to Thread board | ||
| move_voice-message_issues: | ||
| name: A-Voice Messages to voice message board | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Threads') | ||
| contains(github.event.issue.labels.*.name, 'A-Voice Messages') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| with: | ||
|
|
@@ -159,9 +159,8 @@ jobs: | |
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc0rRA" | ||
| PROJECT_ID: "PN_kwDOAM0swc2KCw" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| move_message_bubbles_issues: | ||
| name: A-Message-Bubbles to Message bubbles board | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: Backport | ||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - closed | ||
| - labeled | ||
| branches: | ||
| - develop | ||
|
|
||
| jobs: | ||
| backport: | ||
| name: Backport | ||
| runs-on: ubuntu-latest | ||
| # Only react to merged PRs for security reasons. | ||
| # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. | ||
| if: > | ||
| github.event.pull_request.merged | ||
| && ( | ||
| github.event.action == 'closed' | ||
| || ( | ||
| github.event.action == 'labeled' | ||
| && contains(github.event.label.name, 'backport') | ||
| ) | ||
| ) | ||
| steps: | ||
| - uses: tibdex/backport@v2 | ||
| with: | ||
| labels_template: "<%= JSON.stringify(labels) %>" | ||
| # We can't use GITHUB_TOKEN here or CI won't run on the new PR | ||
| github_token: ${{ secrets.ELEMENT_BOT_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,7 @@ jobs: | |
| - name: Typecheck | ||
| run: "yarn run lint:types" | ||
|
|
||
| # tchap : tchap does not use extensively i18n | ||
| # tchap : tchap does not use extensively i18n | ||
| # i18n_lint: | ||
| # name: "i18n Check" | ||
| # uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop | ||
|
|
@@ -87,3 +87,38 @@ jobs: | |
|
|
||
| # - name: Dead Code Analysis | ||
| # run: "yarn run analyse:unused-exports" | ||
|
|
||
| tsc-strict: | ||
| name: Typescript Strict Error Checker | ||
| if: github.event_name == 'pull_request' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| pull-requests: read | ||
| checks: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Get diff lines | ||
| id: diff | ||
| uses: Equip-Collaboration/[email protected] | ||
| with: | ||
| include: '["\\.tsx?$"]' | ||
|
|
||
| - name: Detecting files changed | ||
| id: files | ||
| uses: futuratrepadeira/[email protected] | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| pattern: '^.*\.tsx?$' | ||
|
|
||
| - uses: t3chguy/typescript-check-action@main | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| use-check: false | ||
| check-fail-mode: added | ||
| output-behaviour: annotate | ||
| ts-extra-args: '--strict' | ||
| files-changed: ${{ steps.files.outputs.files_updated }} | ||
| files-added: ${{ steps.files.outputs.files_created }} | ||
| files-deleted: ${{ steps.files.outputs.files_deleted }} | ||
| line-numbers: ${{ steps.diff.outputs.lineNumbers }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.