Skip to content

Commit 7fa3d86

Browse files
authored
Merge branch 'develop' into renovate/storybook
2 parents 8890e2c + 91e9a00 commit 7fa3d86

File tree

114 files changed

+219
-174
lines changed

Some content is hidden

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

114 files changed

+219
-174
lines changed

.github/actions/setup-playwright/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
PREFIX: ${{ runner.os }}-${{ runner.arch }}
2222

2323
- name: Cache playwright binaries
24-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
24+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
2525
if: inputs.write-cache == 'true'
2626
id: cache
2727
with:
@@ -30,7 +30,7 @@ runs:
3030

3131
# When running in merge queue only restore the cache, never write it
3232
- name: Restore playwright binaries cache
33-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
33+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
3434
if: inputs.write-cache != 'true'
3535
id: cache-restore
3636
with:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ jobs:
8484
run: VERSION=$(scripts/get-version-from-git.sh) pnpm run build
8585

8686
- name: Upload Artifact
87-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
87+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
8888
with:
8989
name: webapp
9090
path: apps/web/webapp
9191
retention-days: 1
9292

9393
- name: Calculate runner variables
9494
id: runner-vars
95-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
95+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
9696
with:
9797
script: |
9898
const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Upload blob report to GitHub Actions Artifacts
174174
if: always()
175-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
175+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
176176
with:
177177
name: blob-report-${{ matrix.project }}-${{ matrix.runner }}
178178
path: apps/web/blob-report
@@ -292,7 +292,7 @@ jobs:
292292
# Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
293293
- name: Upload HTML report
294294
if: always() && inputs.skip != true
295-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
295+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
296296
with:
297297
name: html-report
298298
path: playwright-report

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: VERSION=$(scripts/get-version-from-git.sh) pnpm run build
7070

7171
- name: Upload Artifact
72-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
72+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7373
with:
7474
name: webapp-${{ matrix.image }}
7575
path: apps/web/webapp

.github/workflows/build_debian.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
7070
dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
7171
72-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
72+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7373
with:
7474
name: element-web.deb
7575
path: apps/web/element-web.deb

.github/workflows/build_desktop_and_deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
213213
- name: Stash packages.element.io
214214
if: needs.prepare.outputs.deploy == 'false'
215-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
215+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
216216
with:
217217
name: packages.element.io
218218
path: packages.element.io
@@ -250,7 +250,7 @@ jobs:
250250
251251
- name: Stash debs
252252
if: needs.prepare.outputs.deploy == 'false' && needs.linux.result == 'success'
253-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
253+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
254254
with:
255255
name: debs
256256
path: |
@@ -289,7 +289,7 @@ jobs:
289289
id-token: write # This is required for requesting the JWT
290290
steps:
291291
- name: Configure AWS credentials
292-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
292+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6
293293
with:
294294
role-to-assume: arn:aws:iam::264135176173:role/Push-ElementDesktop-MSI
295295
role-session-name: githubaction-run-${{ github.run_id }}

.github/workflows/build_desktop_linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Cache .hak
106106
id: cache
107-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
107+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
108108
with:
109109
key: ${{ runner.os }}-${{ github.ref_name }}-${{ inputs.sqlcipher }}-${{ inputs.arch }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion', 'apps/desktop/dockerbuild/*') }}
110110
path: |
@@ -216,7 +216,7 @@ jobs:
216216

217217
# We exclude *-unpacked as it loses permissions and the tarball contains it with correct permissions
218218
- name: Upload Artifacts
219-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
219+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
220220
with:
221221
name: ${{ inputs.artifact-prefix }}linux-${{ inputs.arch }}-sqlcipher-${{ inputs.sqlcipher }}
222222
path: |

.github/workflows/build_desktop_macos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090

9191
- name: Cache .hak
9292
id: cache
93-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
93+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
9494
with:
9595
key: ${{ runner.os }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion') }}
9696
path: |
@@ -194,7 +194,7 @@ jobs:
194194

195195
# We exclude mac-universal as the unpacked app takes forever to upload and zip and dmg already contains it
196196
- name: Upload Artifacts
197-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
197+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
198198
with:
199199
name: ${{ inputs.artifact-prefix }}macos
200200
path: |

.github/workflows/build_desktop_prepare.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
env:
186186
NIGHTLY_VERSION: ${{ steps.versions.outputs.nightly }}
187187

188-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
188+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
189189
with:
190190
name: desktop-prepare
191191
retention-days: 1

.github/workflows/build_desktop_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Upload blob report
102102
if: always() && inputs.blob_report
103-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
103+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
104104
with:
105105
name: blob-report-${{ inputs.artifact }}
106106
path: apps/desktop/blob-report
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Upload HTML report
111111
if: always() && inputs.blob_report == false
112-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
112+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
113113
with:
114114
name: ${{ inputs.artifact }}-test
115115
path: apps/desktop/playwright-report

.github/workflows/build_desktop_windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121

122122
- name: Cache .hak
123123
id: cache
124-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
124+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
125125
with:
126126
key: ${{ runner.os }}-${{ inputs.arch }}-${{ hashFiles('apps/desktop/hakHash', 'apps/desktop/electronVersion') }}
127127
path: |
@@ -274,7 +274,7 @@ jobs:
274274
| ForEach-Object -Process {. $env:SIGNTOOL_PATH verify /pa $_.FullName; if(!$?) { throw }}
275275
276276
- name: Upload Artifacts
277-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
277+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
278278
with:
279279
name: ${{ inputs.artifact-prefix }}win-${{ inputs.arch }}
280280
path: |

0 commit comments

Comments
 (0)