Skip to content

Commit ec3d893

Browse files
committed
Merge branch 'develop' into kaylendog/create-room/opts
2 parents 6745f17 + c7f07f4 commit ec3d893

File tree

122 files changed

+2747
-646
lines changed

Some content is hidden

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

122 files changed

+2747
-646
lines changed

.github/workflows/build.yml

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

6868
- name: Upload Artifact
69-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
69+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7070
with:
7171
name: webapp-${{ matrix.image }}
7272
path: webapp

.github/workflows/build_debian.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
6363
dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
6464
65-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
65+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
6666
with:
6767
name: element-web.deb
6868
path: element-web.deb

.github/workflows/build_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
- run: mv dist/element-*.tar.gz dist/develop.tar.gz
5555

56-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
56+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
5757
with:
5858
name: webapp
5959
path: dist/develop.tar.gz

.github/workflows/end-to-end-tests-netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
actions: read
2626
steps:
2727
- name: Download HTML report
28-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
28+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
2929
with:
3030
github-token: ${{ secrets.GITHUB_TOKEN }}
3131
run-id: ${{ github.event.workflow_run.id }}

.github/workflows/end-to-end-tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: VERSION=$(scripts/get-version-from-git.sh) yarn build
7575

7676
- name: Upload Artifact
77-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
77+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7878
with:
7979
name: webapp
8080
path: webapp
@@ -128,7 +128,7 @@ jobs:
128128
repository: element-hq/element-web
129129

130130
- name: 📥 Download artifact
131-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
131+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
132132
with:
133133
name: webapp
134134
path: webapp
@@ -172,7 +172,7 @@ jobs:
172172
173173
- name: Upload blob report to GitHub Actions Artifacts
174174
if: always()
175-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
175+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
176176
with:
177177
name: all-blob-reports-${{ matrix.project }}-${{ matrix.runner }}
178178
path: blob-report
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Download blob reports from GitHub Actions Artifacts
214214
if: inputs.skip != true
215-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
215+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
216216
with:
217217
pattern: all-blob-reports-*
218218
path: all-blob-reports
@@ -228,7 +228,7 @@ jobs:
228228
# Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
229229
- name: Upload HTML report
230230
if: always() && inputs.skip != true
231-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
231+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
232232
with:
233233
name: html-report
234234
path: playwright-report

.github/workflows/netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
Exercise caution. Use test accounts.
2929
3030
- name: 📥 Download artifact
31-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
31+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
3232
with:
3333
github-token: ${{ secrets.GITHUB_TOKEN }}
3434
run-id: ${{ github.event.workflow_run.id }}

.github/workflows/shared-component-publish.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ jobs:
2121
cache: "yarn"
2222
node-version-file: ".node-version"
2323
registry-url: "https://registry.npmjs.org"
24-
env:
25-
NODE_AUTH_TOKEN: ${{ secrets.ELEMENT_NPM_TOKEN }}
24+
25+
# Ensure npm 11.5.1 or later is installed
26+
- name: Update npm
27+
run: npm install -g npm@latest
2628

2729
- name: 🛠️ Setup
2830
# When running `install` it also calls the `prepare` step which generates

.github/workflows/shared-component-visual-tests-netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: "sudo apt-get install -y tree"
2828

2929
- name: Download Diffs
30-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
30+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6
3131
with:
3232
github-token: ${{ secrets.GITHUB_TOKEN }}
3333
run-id: ${{ github.event.workflow_run.id }}

.github/workflows/shared-component-visual-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: Upload received images & diffs
7272
if: always()
73-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
73+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7474
with:
7575
name: received-images
7676
path: packages/shared-components/playwright/shared-component-received

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Upload Artifact
8686
if: env.ENABLE_COVERAGE == 'true'
87-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
87+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
8888
with:
8989
name: coverage-${{ matrix.runner }}
9090
path: |

0 commit comments

Comments
 (0)