Skip to content

Commit 6333212

Browse files
committed
Merge tag 'v3.48.0' into sc
* Remove Piwik support ([\matrix-org#8835](matrix-org#8835)). * Move New Search Experience out of beta ([\matrix-org#8859](matrix-org#8859)). Contributed by @justjanne. * Switch video rooms to spotlight layout when in PiP mode ([\matrix-org#8912](matrix-org#8912)). Fixes element-hq/element-web#22574. * Live location sharing - render message deleted tile for redacted beacons ([\matrix-org#8905](matrix-org#8905)). Contributed by @kerryarchibald. * Improve view source dialog style ([\matrix-org#8883](matrix-org#8883)). Fixes element-hq/element-web#22636. Contributed by @luixxiul. * Improve integration manager dialog style ([\matrix-org#8888](matrix-org#8888)). Fixes element-hq/element-web#22642. Contributed by @luixxiul. * Implement MSC3827: Filtering of `/publicRooms` by room type ([\matrix-org#8866](matrix-org#8866)). Fixes element-hq/element-web#22578. * Show chat panel when opening a video room with unread messages ([\matrix-org#8812](matrix-org#8812)). Fixes element-hq/element-web#22527. * Live location share - forward latest location ([\matrix-org#8860](matrix-org#8860)). Contributed by @kerryarchibald. * Allow integration managers to validate user identity after opening ([\matrix-org#8782](matrix-org#8782)). Contributed by @Half-Shot. * Create a common header on right panel cards on BaseCard ([\matrix-org#8808](matrix-org#8808)). Contributed by @luixxiul. * Integrate searching public rooms and people into the new search experience ([\matrix-org#8707](matrix-org#8707)). Fixes element-hq/element-web#21354 and element-hq/element-web#19349. Contributed by @justjanne. * Bring back waveform for voice messages and retain seeking ([\matrix-org#8843](matrix-org#8843)). Fixes element-hq/element-web#21904. * Improve colors in settings ([\matrix-org#7283](matrix-org#7283)). * Keep draft in composer when a slash command syntax errors ([\matrix-org#8811](matrix-org#8811)). Fixes element-hq/element-web#22384. * Release video rooms as a beta feature ([\matrix-org#8431](matrix-org#8431)). * Clarify logout key backup warning dialog. Contributed by @notramo. ([\matrix-org#8741](matrix-org#8741)). Fixes element-hq/element-web#15565. Contributed by @MadLittleMods. * Slightly improve the look of the `Message edits` dialog ([\matrix-org#8763](matrix-org#8763)). Fixes element-hq/element-web#22410. * Add support for MD / HTML in room topics ([\matrix-org#8215](matrix-org#8215)). Fixes element-hq/element-web#5180. Contributed by @Johennes. * Live location share - link to timeline tile from share warning ([\matrix-org#8752](matrix-org#8752)). Contributed by @kerryarchibald. * Improve composer visiblity ([\matrix-org#8578](matrix-org#8578)). Fixes vector-im/element-web#22072 and element-hq/element-web#17362. * Makes the avatar of the user menu non-draggable ([\matrix-org#8765](matrix-org#8765)). Contributed by @luixxiul. * Improve widget buttons behaviour and layout ([\matrix-org#8734](matrix-org#8734)). * Use AccessibleButton for 'Reset All' link button on SetupEncryptionBody ([\matrix-org#8730](matrix-org#8730)). Contributed by @luixxiul. * Adjust message timestamp position on TimelineCard in non-bubble layouts ([\matrix-org#8745](matrix-org#8745)). Fixes element-hq/element-web#22426. Contributed by @luixxiul. * Use AccessibleButton for 'In reply to' link button on ReplyChain ([\matrix-org#8726](matrix-org#8726)). Fixes element-hq/element-web#22407. Contributed by @luixxiul. * Live location share - enable reply and react to tiles ([\matrix-org#8721](matrix-org#8721)). Contributed by @kerryarchibald. * Change dash to em dash issues fixed ([\matrix-org#8455](matrix-org#8455)). Fixes element-hq/element-web#21895. Contributed by @goelesha. * Make invite dialogue fixed height ([\matrix-org#8945](matrix-org#8945)). * Correct issue with tab order in new search experience ([\matrix-org#8919](matrix-org#8919)). Fixes element-hq/element-web#22670. Contributed by @justjanne. * Clicking location replies now redirects to the replied event instead of opening the map ([\matrix-org#8918](matrix-org#8918)). Fixes element-hq/element-web#22667. * Keep clicks on pills within the app ([\matrix-org#8917](matrix-org#8917)). Fixes element-hq/element-web#22653. * Don't overlap tile bubbles with timestamps in modern layout ([\matrix-org#8908](matrix-org#8908)). Fixes element-hq/element-web#22425. * Connect to Jitsi unmuted by default ([\matrix-org#8909](matrix-org#8909)). * Maximize width value of display name on TimelineCard with IRC/modern layout ([\matrix-org#8904](matrix-org#8904)). Fixes element-hq/element-web#22651. Contributed by @luixxiul. * Align the avatar and the display name on TimelineCard ([\matrix-org#8900](matrix-org#8900)). Contributed by @luixxiul. * Remove inline margin from reactions row on IRC layout ([\matrix-org#8891](matrix-org#8891)). Fixes element-hq/element-web#22644. Contributed by @luixxiul. * Align "From a thread" on search result panel on IRC layout ([\matrix-org#8892](matrix-org#8892)). Fixes element-hq/element-web#22645. Contributed by @luixxiul. * Display description of E2E advanced panel as subsection text ([\matrix-org#8889](matrix-org#8889)). Contributed by @luixxiul. * Remove inline end margin from images on file panel ([\matrix-org#8886](matrix-org#8886)). Fixes element-hq/element-web#22640. Contributed by @luixxiul. * Disable option to `Quote` when we don't have sufficient permissions ([\matrix-org#8893](matrix-org#8893)). Fixes element-hq/element-web#22643. * Add padding to font scaling loader for message bubble layout ([\matrix-org#8875](matrix-org#8875)). Fixes element-hq/element-web#22626. Contributed by @luixxiul. * Set 100% max-width to display name on reply tiles ([\matrix-org#8867](matrix-org#8867)). Fixes element-hq/element-web#22615. Contributed by @luixxiul. * Fix alignment of pill letter ([\matrix-org#8874](matrix-org#8874)). Fixes element-hq/element-web#22622. Contributed by @luixxiul. * Move the beta pill to the right side and display the pill on video room only ([\matrix-org#8873](matrix-org#8873)). Fixes element-hq/element-web#22619 and element-hq/element-web#22620. Contributed by @luixxiul. * Stop using absolute property to place beta pill on RoomPreviewCard ([\matrix-org#8872](matrix-org#8872)). Fixes element-hq/element-web#22617. Contributed by @luixxiul. * Make the pill text single line ([\matrix-org#8744](matrix-org#8744)). Fixes element-hq/element-web#22427. Contributed by @luixxiul. * Hide overflow of public room description on spotlight dialog result ([\matrix-org#8870](matrix-org#8870)). Contributed by @luixxiul. * Fix position of message action bar on the info tile on TimelineCard in message bubble layout ([\matrix-org#8865](matrix-org#8865)). Fixes element-hq/element-web#22614. Contributed by @luixxiul. * Remove inline start margin from display name on reply tiles on TimelineCard ([\matrix-org#8864](matrix-org#8864)). Fixes element-hq/element-web#22613. Contributed by @luixxiul. * Improve homeserver dropdown dialog styling ([\matrix-org#8850](matrix-org#8850)). Fixes element-hq/element-web#22552. Contributed by @justjanne. * Fix crash when drawing blurHash for portrait videos PSB-139 ([\matrix-org#8855](matrix-org#8855)). Fixes element-hq/element-web#22597. Contributed by @andybalaam. * Fix grid blowout on pinned event tiles ([\matrix-org#8816](matrix-org#8816)). Fixes element-hq/element-web#22543. Contributed by @luixxiul. * Fix temporary sync errors if there's weird settings stored in account data ([\matrix-org#8857](matrix-org#8857)). * Fix reactions row overflow and gap between reactions ([\matrix-org#8813](matrix-org#8813)). Fixes element-hq/element-web#22093. Contributed by @luixxiul. * Fix issues with the Create new room button in Spotlight ([\matrix-org#8851](matrix-org#8851)). Contributed by @justjanne. * Remove margin from E2E icon between avatar and hidden event ([\matrix-org#8584](matrix-org#8584)). Fixes element-hq/element-web#22186. Contributed by @luixxiul. * Fix waveform on a message bubble ([\matrix-org#8852](matrix-org#8852)). Contributed by @luixxiul. * Location sharing maps are now loaded after reconnection ([\matrix-org#8848](matrix-org#8848)). Fixes element-hq/element-web#20993. * Update the avatar mask so it doesn’t cut off spaces’ avatars anymore ([\matrix-org#8849](matrix-org#8849)). Contributed by @justjanne. * Add a bit of safety around timestamp handling for threads ([\matrix-org#8845](matrix-org#8845)). * Remove top margin from event tile on a narrow viewport ([\matrix-org#8814](matrix-org#8814)). Contributed by @luixxiul. * Fix keyboard shortcuts on settings tab being wrapped ([\matrix-org#8825](matrix-org#8825)). Fixes element-hq/element-web#22547. Contributed by @luixxiul. * Add try-catch around blurhash loading ([\matrix-org#8830](matrix-org#8830)). * Prevent new composer from overflowing from non-breakable text ([\matrix-org#8829](matrix-org#8829)). Fixes element-hq/element-web#22507. Contributed by @justjanne. * Use common subheading on sidebar user settings tab ([\matrix-org#8823](matrix-org#8823)). Contributed by @luixxiul. * Fix clickable area of advanced toggle on appearance user settings tab ([\matrix-org#8820](matrix-org#8820)). Fixes element-hq/element-web#22546. Contributed by @luixxiul. * Disable redacting reactions if we don't have sufficient permissions ([\matrix-org#8767](matrix-org#8767)). Fixes element-hq/element-web#22262. * Update the live timeline when the JS SDK resets it ([\matrix-org#8806](matrix-org#8806)). Fixes element-hq/element-web#22421. * Fix flex blowout on image reply ([\matrix-org#8809](matrix-org#8809)). Fixes element-hq/element-web#22509 and element-hq/element-web#22510. Contributed by @luixxiul. * Enable background color on hover for chat panel and thread panel ([\matrix-org#8644](matrix-org#8644)). Fixes element-hq/element-web#22273. Contributed by @luixxiul. * Fix #20026: send read marker as soon as we change it ([\matrix-org#8802](matrix-org#8802)). Fixes element-hq/element-web#20026. Contributed by @andybalaam. * Allow AppTiles to shrink as much as necessary ([\matrix-org#8805](matrix-org#8805)). Fixes element-hq/element-web#22499. * Make widgets in video rooms immutable again ([\matrix-org#8803](matrix-org#8803)). Fixes element-hq/element-web#22497. * Use MessageActionBar style declarations on pinned message card ([\matrix-org#8757](matrix-org#8757)). Fixes element-hq/element-web#22444. Contributed by @luixxiul. * Expire video member events after 1 hour ([\matrix-org#8776](matrix-org#8776)). * Name lists on invite dialog ([\matrix-org#8046](matrix-org#8046)). Fixes element-hq/element-web#21400 and element-hq/element-web#19463. Contributed by @luixxiul. * Live location share - show loading UI for beacons with start timestamp in the future ([\matrix-org#8775](matrix-org#8775)). Fixes element-hq/element-web#22437. Contributed by @kerryarchibald. * Fix scroll jump issue with the composer ([\matrix-org#8788](matrix-org#8788)). Fixes element-hq/element-web#22464. * Fix the incorrect nesting of download button on MessageActionBar ([\matrix-org#8785](matrix-org#8785)). Contributed by @luixxiul. * Revert link color change in composer ([\matrix-org#8784](matrix-org#8784)). Fixes element-hq/element-web#22468. * Fix 'Logout' inline link on the splash screen ([\matrix-org#8770](matrix-org#8770)). Fixes element-hq/element-web#22449. Contributed by @luixxiul. * Fix disappearing widget poput button when changing the widget layout ([\matrix-org#8754](matrix-org#8754)). * Reduce gutter with the new read receipt UI ([\matrix-org#8736](matrix-org#8736)). Fixes element-hq/element-web#21890. * Add ellipsis effect to hidden beacon status ([\matrix-org#8755](matrix-org#8755)). Fixes element-hq/element-web#22441. Contributed by @luixxiul. * Make the pill on the basic message composer compatible with display name in RTL languages ([\matrix-org#8758](matrix-org#8758)). Fixes element-hq/element-web#22445. Contributed by @luixxiul. * Prevent the banner text from being selected, replacing the spacing values with the variable ([\matrix-org#8756](matrix-org#8756)). Fixes element-hq/element-web#22442. Contributed by @luixxiul. * Ensure the first device on a newly-registered account gets cross-signed properly ([\matrix-org#8750](matrix-org#8750)). Fixes element-hq/element-web#21977. Contributed by @duxovni. * Hide live location option in threads composer ([\matrix-org#8746](matrix-org#8746)). Fixes element-hq/element-web#22424. Contributed by @kerryarchibald. * Make sure MessageTimestamp is not hidden by EventTile_line on TimelineCard ([\matrix-org#8748](matrix-org#8748)). Contributed by @luixxiul. * Make PiP motion smoother and react to window resizes correctly ([\matrix-org#8747](matrix-org#8747)). Fixes element-hq/element-web#22292. * Prevent Invite and DevTools dialogs from being cut off ([\matrix-org#8646](matrix-org#8646)). Fixes element-hq/element-web#20911 and undefined/matrix-react-sdk#8165. Contributed by @justjanne. * Squish event bubble tiles less ([\matrix-org#8740](matrix-org#8740)). * Use random widget IDs for video rooms ([\matrix-org#8739](matrix-org#8739)). Fixes element-hq/element-web#22417. * Fix read avatars overflow from the right chat panel with a maximized widget on bubble message layout ([\matrix-org#8470](matrix-org#8470)). Contributed by @luixxiul. * Fix `CallView` crash ([\matrix-org#8735](matrix-org#8735)). Fixes element-hq/element-web#22394.
2 parents 2ec6602 + 5a1ed59 commit 6333212

File tree

433 files changed

+10506
-6589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

433 files changed

+10506
-6589
lines changed

.github/workflows/cypress.yaml

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# Triggers after the layered build has finished, taking the artifact and running cypress on it
2+
name: Cypress End to End Tests
3+
on:
4+
workflow_run:
5+
workflows: [ "Element Web - Build" ]
6+
types:
7+
- completed
8+
jobs:
9+
# This job cannot have a pretty name due to https://github.com/haya14busa/action-workflow_run-status/issues/158
10+
cypress:
11+
if: github.event.workflow_run.conclusion == 'success'
12+
runs-on: ubuntu-latest
13+
permissions:
14+
actions: read
15+
statuses: write
16+
issues: read
17+
pull-requests: read
18+
environment: Cypress
19+
steps:
20+
# Wire up the status check for this workflow_run action
21+
- uses: haya14busa/action-workflow_run-status@967ed83efa565c257675ed70cfe5231f062ddd94 # v1.0.0
22+
23+
- id: prdetails
24+
if: github.event.workflow_run.event == 'pull_request'
25+
uses: matrix-org/[email protected]
26+
with:
27+
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
28+
branch: ${{ github.event.workflow_run.head_branch }}
29+
30+
- uses: actions/checkout@v2
31+
with:
32+
# XXX: We're checking out untrusted code in a secure context
33+
# We need to be careful to not trust anything this code outputs/may do
34+
# We need to check this out to access the cypress tests which are on the head branch
35+
repository: ${{ github.event.workflow_run.head_repository.full_name }}
36+
ref: ${{ github.event.workflow_run.head_sha }}
37+
persist-credentials: false
38+
39+
# There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
40+
# (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
41+
- name: 📥 Download artifact
42+
uses: dawidd6/action-download-artifact@v2
43+
with:
44+
workflow: element-build-and-test.yaml
45+
run_id: ${{ github.event.workflow_run.id }}
46+
name: previewbuild
47+
path: webapp
48+
49+
- name: Get commit details
50+
if: github.event.workflow_run.event == 'pull_request'
51+
uses: actions/github-script@v5
52+
with:
53+
script: |
54+
const response = await github.rest.git.getCommit({
55+
owner: context.repo.owner,
56+
repo: context.repo.repo,
57+
commit_sha: "${{ github.event.workflow_run.head_sha }}",
58+
});
59+
core.exportVariable("COMMIT_INFO_MESSAGE", response.data.message);
60+
core.exportVariable("COMMIT_INFO_AUTHOR", response.data.author.name);
61+
core.exportVariable("COMMIT_INFO_EMAIL", response.data.author.email);
62+
63+
# Only run Percy when it is demanded or on develop
64+
- name: Disable Percy if not needed
65+
if: |
66+
github.event.workflow_run.event == 'pull_request' &&
67+
!contains(fromJSON(steps.prdetails.outputs.data).labels.*.name, 'X-Needs-Percy')
68+
run: |
69+
echo "PERCY_ENABLE=0" >> $GITHUB_ENV
70+
71+
- name: Run Cypress tests
72+
uses: cypress-io/github-action@v2
73+
with:
74+
# The built-in Electron runner seems to grind to a halt trying
75+
# to run the tests, so use chrome.
76+
browser: chrome
77+
start: npx serve -p 8080 webapp
78+
wait-on: 'http://localhost:8080'
79+
record: true
80+
command-prefix: 'yarn percy exec --'
81+
env:
82+
# pass the Dashboard record key as an environment variable
83+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
84+
# tell Cypress more details about the context of this run
85+
COMMIT_INFO_BRANCH: ${{ github.event.workflow_run.head_branch }}
86+
COMMIT_INFO_SHA: ${{ github.event.workflow_run.head_sha }}
87+
COMMIT_INFO_REMOTE: ${{ github.repositoryUrl }}
88+
89+
# pass the Percy token as an environment variable
90+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
91+
# Use existing chromium rather than downloading another
92+
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
93+
PERCY_BROWSER_EXECUTABLE: /usr/bin/chromium-browser
94+
# tell Percy more details about the context of this run
95+
PERCY_BRANCH: ${{ github.event.workflow_run.head_branch }}
96+
PERCY_COMMIT: ${{ github.event.workflow_run.head_sha }}
97+
PERCY_PULL_REQUEST: ${{ steps.prdetails.outputs.pr_id }}
98+
# pass GitHub token to allow accurately detecting a build vs a re-run build
99+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100+
# make Node's os.tmpdir() return something where we actually have permissions
101+
TMPDIR: ${{ runner.temp }}
102+
103+
- name: Upload Artifact
104+
if: failure()
105+
uses: actions/upload-artifact@v2
106+
with:
107+
name: cypress-results
108+
path: |
109+
cypress/screenshots
110+
cypress/videos
111+
cypress/synapselogs
112+
113+
- name: Upload Benchmark
114+
uses: actions/upload-artifact@v2
115+
with:
116+
name: cypress-benchmark
117+
path: cypress/performance/measurements.json
118+
retention-days: 1
119+
120+
store-benchmark:
121+
needs: cypress
122+
runs-on: ubuntu-latest
123+
if: |
124+
github.event.workflow_run.event != 'pull_request' &&
125+
github.event.workflow_run.head_branch == 'develop' &&
126+
github.event.workflow_run.head_repository.full_name == github.repository
127+
permissions:
128+
contents: write
129+
steps:
130+
- uses: actions/checkout@v2
131+
132+
- name: Download benchmark result
133+
uses: actions/download-artifact@v3
134+
with:
135+
name: cypress-benchmark
136+
137+
- name: Store benchmark result
138+
uses: matrix-org/github-action-benchmark@jsperfentry-6
139+
with:
140+
name: Cypress measurements
141+
tool: 'jsperformanceentry'
142+
output-file-path: measurements.json
143+
# The dashboard is available at https://matrix-org.github.io/matrix-react-sdk/cypress/bench/
144+
benchmark-data-dir-path: cypress/bench
145+
fail-on-alert: false
146+
comment-on-alert: false
147+
github-token: ${{ secrets.GITHUB_TOKEN }}
148+
auto-push: ${{ github.event.workflow_run.event != 'pull_request' }}

.github/workflows/element-build-and-test.yaml

Lines changed: 0 additions & 125 deletions
This file was deleted.

.github/workflows/element-web.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Produce a build of element-web with this version of react-sdk
2+
# and any matching branches of element-web and js-sdk, output it
3+
# as an artifact and run integration tests.
4+
name: Element Web - Build
5+
on:
6+
pull_request: { }
7+
push:
8+
branches: [ develop, master ]
9+
repository_dispatch:
10+
types: [ upstream-sdk-notify ]
11+
env:
12+
# These must be set for fetchdep.sh to get the right branch
13+
REPOSITORY: ${{ github.repository }}
14+
PR_NUMBER: ${{ github.event.pull_request.number }}
15+
jobs:
16+
build:
17+
name: "Build Element-Web"
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- uses: actions/setup-node@v3
23+
with:
24+
cache: 'yarn'
25+
26+
- name: Fetch layered build
27+
id: layered_build
28+
run: |
29+
scripts/ci/layered.sh
30+
JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
31+
REACT_SHA=$(git rev-parse --short=12 HEAD)
32+
VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD)
33+
echo "::set-output name=VERSION::$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA"
34+
35+
- name: Copy config
36+
run: cp element.io/develop/config.json config.json
37+
working-directory: ./element-web
38+
39+
- name: Build
40+
env:
41+
CI_PACKAGE: true
42+
VERSION: "${{ steps.layered_build.outputs.VERSION }}"
43+
run: yarn build
44+
working-directory: ./element-web
45+
46+
- name: Upload Artifact
47+
uses: actions/upload-artifact@v2
48+
with:
49+
name: previewbuild
50+
path: element-web/webapp
51+
# We'll only use this in a triggered job, then we're done with it
52+
retention-days: 1

.github/workflows/pull_request.yaml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,9 @@ on:
44
types: [ opened, edited, labeled, unlabeled, synchronize ]
55
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
66
jobs:
7-
changelog:
8-
name: Preview Changelog
9-
if: github.event.action != 'synchronize'
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: matrix-org/allchange@main
13-
with:
14-
ghToken: ${{ secrets.GITHUB_TOKEN }}
15-
16-
enforce-label:
17-
name: Enforce Labels
18-
runs-on: ubuntu-latest
19-
permissions:
20-
pull-requests: read
21-
steps:
22-
- uses: yogevbd/[email protected]
23-
with:
24-
REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task"
25-
BANNED_LABELS: "X-Blocked"
26-
BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"
7+
action:
8+
uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
9+
with:
10+
labels: "T-Defect,T-Enhancement,T-Task"
11+
secrets:
12+
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/sonarqube.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,8 @@ concurrency:
88
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
99
cancel-in-progress: true
1010
jobs:
11-
prdetails:
12-
name: ℹ️ PR Details
13-
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
14-
uses: matrix-org/matrix-js-sdk/.github/workflows/pr_details.yml@develop
15-
with:
16-
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
17-
branch: ${{ github.event.workflow_run.head_branch }}
18-
1911
sonarqube:
2012
name: 🩻 SonarQube
21-
needs: prdetails
22-
# Only wait for prdetails if it isn't skipped
23-
if: |
24-
always() &&
25-
(needs.prdetails.result == 'success' || needs.prdetails.result == 'skipped') &&
26-
github.event.workflow_run.conclusion == 'success'
2713
uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
28-
with:
29-
repo: ${{ github.event.workflow_run.head_repository.full_name }}
30-
pr_id: ${{ needs.prdetails.outputs.pr_id }}
31-
head_branch: ${{ needs.prdetails.outputs.head_branch || github.event.workflow_run.head_branch }}
32-
base_branch: ${{ needs.prdetails.outputs.base_branch }}
33-
revision: ${{ github.event.workflow_run.head_sha }}
34-
coverage_workflow_name: tests.yml
35-
coverage_run_id: ${{ github.event.workflow_run.id }}
3614
secrets:
3715
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

0 commit comments

Comments
 (0)