Skip to content

Commit ad0a8ca

Browse files
authored
Merge branch 'develop' into hs/update-media-prefix
2 parents a34d706 + 3bb22a9 commit ad0a8ca

38 files changed

+1179
-625
lines changed

.github/workflows/release-drafter-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
contents: write
1717
steps:
1818
- name: 🧮 Checkout code
19-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2020
with:
2121
ref: staging
2222
fetch-depth: 0
@@ -38,7 +38,7 @@ jobs:
3838
disable-autolabeler: true
3939

4040
- name: Get actions scripts
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4242
with:
4343
repository: matrix-org/matrix-js-sdk
4444
persist-credentials: false

.github/workflows/release-gitflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
merge:
1919
runs-on: ubuntu-24.04
2020
steps:
21-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2222
with:
2323
# We will be pushing to this branch and want the CI to run after we do so we cannot use the GITHUB_TOKEN
2424
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
2525
fetch-depth: 0
2626

2727
- name: Get actions scripts
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2929
with:
3030
repository: matrix-org/matrix-js-sdk
3131
persist-credentials: false

.github/workflows/release-make.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ jobs:
7171
draft: true
7272
latest: true
7373

74-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
74+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
7575
with:
7676
ref: staging
7777
# We will be pushing to this branch and want the CI to run after we do so we cannot use the GITHUB_TOKEN
7878
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
7979
fetch-depth: 0
8080

8181
- name: Get actions scripts
82-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
82+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8383
with:
8484
repository: matrix-org/matrix-js-sdk
8585
persist-credentials: false

.github/workflows/release-npm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
id: ${{ steps.npm-publish.outputs.id }}
1818
steps:
1919
- name: 🧮 Checkout code
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2121
with:
2222
ref: staging
2323

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
repo:
4545
- element-hq/element-web
4646
steps:
47-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
47+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4848
with:
4949
repository: ${{ matrix.repo }}
5050
ref: staging
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-24.04
7575
steps:
7676
- name: 🧮 Checkout code
77-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
77+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
7878

7979
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
8080
- name: 🔧 pnpm cache

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
3737

3838
- name: "🧮 Checkout code"
39-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4040
with:
4141
repository: ${{ github.event.workflow_run.head_repository.full_name }}
4242
ref: ${{ github.event.workflow_run.head_branch }} # checkout commit that triggered this workflow

.github/workflows/static_analysis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: "Typescript Syntax Check"
1515
runs-on: ubuntu-24.04
1616
steps:
17-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1818

1919
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
2020
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -32,7 +32,7 @@ jobs:
3232
name: "ESLint"
3333
runs-on: ubuntu-24.04
3434
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3636

3737
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
3838
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -50,7 +50,7 @@ jobs:
5050
name: "Node.js example"
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
53+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5454

5555
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
5656
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -80,7 +80,7 @@ jobs:
8080
name: "Workflow Lint"
8181
runs-on: ubuntu-24.04
8282
steps:
83-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
83+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8484

8585
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
8686
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -98,7 +98,7 @@ jobs:
9898
name: "JSDoc Checker"
9999
runs-on: ubuntu-24.04
100100
steps:
101-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
101+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
102102

103103
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
104104
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -124,7 +124,7 @@ jobs:
124124
name: "Analyse Dead Code"
125125
runs-on: ubuntu-24.04
126126
steps:
127-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
127+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
128128

129129
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
130130
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
@@ -143,7 +143,7 @@ jobs:
143143
if: github.event_name == 'merge_group'
144144
runs-on: ubuntu-24.04
145145
steps:
146-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
146+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
147147
with:
148148
repository: element-hq/element-web
149149

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
node: ["lts/*", 22]
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2626

2727
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
2828
- name: Setup Node

.github/workflows/triage-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
pull-requests: write
1414
steps:
15-
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10
15+
- uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10
1616
with:
1717
operations-per-run: 250
1818
days-before-issue-stale: -1

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
],
5050
"dependencies": {
5151
"@babel/runtime": "^7.12.5",
52-
"@matrix-org/matrix-sdk-crypto-wasm": "^17.0.0",
52+
"@matrix-org/matrix-sdk-crypto-wasm": "^17.1.0",
5353
"another-json": "^0.2.0",
5454
"bs58": "^6.0.0",
5555
"content-type": "^1.0.4",
@@ -133,5 +133,5 @@
133133
"eslint": "8"
134134
}
135135
},
136-
"packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264"
136+
"packageManager": "pnpm@10.29.3+sha512.498e1fb4cca5aa06c1dcf2611e6fafc50972ffe7189998c409e90de74566444298ffe43e6cd2acdc775ba1aa7cc5e092a8b7054c811ba8c5770f84693d33d2dc"
137137
}

0 commit comments

Comments
 (0)