Skip to content

Commit 4c67edf

Browse files
committed
Merge branch 'release/25.08.3' into main
2 parents 8b4b321 + f3ac96e commit 4c67edf

File tree

3,103 files changed

+12254
-8439
lines changed

Some content is hidden

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

3,103 files changed

+12254
-8439
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}-{1}', matrix.variant, github.sha) || format('build-{0}-{1}', matrix.variant, github.ref) }}
2626
cancel-in-progress: true
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
with:
3030
# Ensure we are building the branch and not the branch after being merged on develop
3131
# https://github.com/actions/checkout/issues/881
@@ -69,7 +69,7 @@ jobs:
6969
retention-days: 5
7070
overwrite: true
7171
if-no-files-found: error
72-
- uses: rnkdsh/action-upload-diawi@993c2e9f871486114a171cf7fb40554716dac3c5 # v1.5.10
72+
- uses: rnkdsh/action-upload-diawi@26292a7b424bdc9f4ab4ccea6202fc513f571370 # v1.5.11
7373
id: diawi
7474
# Do not fail the whole build if Diawi upload fails
7575
continue-on-error: true

.github/workflows/build_enterprise.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-enterprise-{0}-{1}', matrix.variant, github.sha) || format('build-enterprise-{0}-{1}', matrix.variant, github.ref) }}
2828
cancel-in-progress: true
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
with:
3232
# Ensure we are building the branch and not the branch after being merged on develop
3333
# https://github.com/actions/checkout/issues/881

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
# Skip in forks, it doesn't work even with the fallback token
1010
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Add SSH private keys for submodule repositories
1414
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
1515
with:

.github/workflows/generate_github_pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Python 3.12
2626
uses: actions/setup-python@v5
2727
with:
28-
python-version: 3.12
28+
python-version: 3.13
2929
- name: Run World screenshots generation script
3030
run: |
3131
./tools/test/generateWorldScreenshots.py

.github/workflows/gradle-wrapper-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# Skip in forks
1212
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- uses: actions/setup-java@v4
1616
name: Use JDK 21
1717
if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'

.github/workflows/maestro-local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
group: ${{ format('maestro-{0}', github.ref) }}
2424
cancel-in-progress: true
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
with:
2828
# Ensure we are building the branch and not the branch after being merged on develop
2929
# https://github.com/actions/checkout/issues/881
@@ -62,7 +62,7 @@ jobs:
6262
group: ${{ format('maestro-{0}', github.ref) }}
6363
cancel-in-progress: true
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6666
if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
6767
with:
6868
# Ensure we are building the branch and not the branch after being merged on develop

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
if: ${{ github.repository == 'element-hq/element-x-android' }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
- name: Use JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/nightlyReports.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
name: Dependency analysis
6161
runs-on: ubuntu-latest
6262
steps:
63-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@v5
6464
- name: Use JDK 21
6565
uses: actions/setup-java@v4
6666
with:

.github/workflows/quality.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Search for forbidden patterns
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Add SSH private keys for submodule repositories
2222
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
2323
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -33,19 +33,19 @@ jobs:
3333
name: Search for invalid screenshot files
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3737
- name: Set up Python 3.12
3838
uses: actions/setup-python@v5
3939
with:
40-
python-version: 3.12
40+
python-version: 3.13
4141
- name: Search for invalid screenshot files
4242
run: ./tools/test/checkInvalidScreenshots.py
4343

4444
checkDependencies:
4545
name: Search for invalid dependencies
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v5
4949
- name: Use JDK 21
5050
uses: actions/setup-java@v4
5151
with:
@@ -58,7 +58,7 @@ jobs:
5858
- name: Set up Python 3.12
5959
uses: actions/setup-python@v5
6060
with:
61-
python-version: 3.12
61+
python-version: 3.13
6262
- name: Search for invalid dependencies
6363
run: ./tools/dependencies/checkDependencies.py
6464

@@ -71,7 +71,7 @@ jobs:
7171
group: ${{ github.ref == 'refs/heads/main' && format('check-konsist-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-konsist-develop-{0}', github.sha) || format('check-konsist-{0}', github.ref) }}
7272
cancel-in-progress: true
7373
steps:
74-
- uses: actions/checkout@v4
74+
- uses: actions/checkout@v5
7575
with:
7676
# Ensure we are building the branch and not the branch after being merged on develop
7777
# https://github.com/actions/checkout/issues/881
@@ -111,7 +111,7 @@ jobs:
111111
group: ${{ github.ref == 'refs/heads/main' && format('check-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-lint-develop-{0}', github.sha) || format('check-lint-{0}', github.ref) }}
112112
cancel-in-progress: true
113113
steps:
114-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@v5
115115
with:
116116
# Ensure we are building the branch and not the branch after being merged on develop
117117
# https://github.com/actions/checkout/issues/881
@@ -155,7 +155,7 @@ jobs:
155155
group: ${{ github.ref == 'refs/heads/main' && format('check-detekt-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-detekt-develop-{0}', github.sha) || format('check-detekt-{0}', github.ref) }}
156156
cancel-in-progress: true
157157
steps:
158-
- uses: actions/checkout@v4
158+
- uses: actions/checkout@v5
159159
with:
160160
# Ensure we are building the branch and not the branch after being merged on develop
161161
# https://github.com/actions/checkout/issues/881
@@ -195,7 +195,7 @@ jobs:
195195
group: ${{ github.ref == 'refs/heads/main' && format('check-ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-ktlint-develop-{0}', github.sha) || format('check-ktlint-{0}', github.ref) }}
196196
cancel-in-progress: true
197197
steps:
198-
- uses: actions/checkout@v4
198+
- uses: actions/checkout@v5
199199
with:
200200
# Ensure we are building the branch and not the branch after being merged on develop
201201
# https://github.com/actions/checkout/issues/881
@@ -235,7 +235,7 @@ jobs:
235235
group: ${{ github.ref == 'refs/heads/main' && format('check-knit-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-knit-develop-{0}', github.sha) || format('check-knit-{0}', github.ref) }}
236236
cancel-in-progress: true
237237
steps:
238-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
239239
with:
240240
# Ensure we are building the branch and not the branch after being merged on develop
241241
# https://github.com/actions/checkout/issues/881
@@ -266,7 +266,7 @@ jobs:
266266
name: Check shell scripts
267267
runs-on: ubuntu-latest
268268
steps:
269-
- uses: actions/checkout@v4
269+
- uses: actions/checkout@v5
270270
- name: Run shellcheck
271271
uses: ludeeus/action-shellcheck@2.0.0
272272
with:
@@ -278,7 +278,7 @@ jobs:
278278
needs: [konsist, lint, ktlint, detekt]
279279
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
280280
steps:
281-
- uses: actions/checkout@v4
281+
- uses: actions/checkout@v5
282282
with:
283283
# Ensure we are building the branch and not the branch after being merged on develop
284284
# https://github.com/actions/checkout/issues/881

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
group: ${{ format('build-release-main-gplay-{0}', github.sha) }}
1919
cancel-in-progress: true
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Use JDK 21
2323
uses: actions/setup-java@v4
2424
with:
@@ -52,7 +52,7 @@ jobs:
5252
group: ${{ format('build-release-main-enterprise-{0}', github.sha) }}
5353
cancel-in-progress: true
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v5
5656
- name: Add SSH private keys for submodule repositories
5757
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
5858
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
@@ -87,7 +87,7 @@ jobs:
8787
group: ${{ format('build-release-main-fdroid-{0}', github.sha) }}
8888
cancel-in-progress: true
8989
steps:
90-
- uses: actions/checkout@v4
90+
- uses: actions/checkout@v5
9191
- name: Use JDK 21
9292
uses: actions/setup-java@v4
9393
with:

0 commit comments

Comments
 (0)