Skip to content

Commit 386bd11

Browse files
jmartinespjmartinesp
committed
Merge branch 'release/25.12.0'
2 parents 94bca7b + 8578f83 commit 386bd11

File tree

503 files changed

+6825
-3099
lines changed

Some content is hidden

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

503 files changed

+6825
-3099
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
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@v5
28+
- uses: actions/checkout@v6
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

‎.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@v5
30+
- uses: actions/checkout@v6
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@v5
12+
- uses: actions/checkout@v6
1313
- name: Add SSH private keys for submodule repositories
1414
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
1515
with:

‎.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@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions/setup-java@v5
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@v5
26+
- uses: actions/checkout@v6
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@v5
65+
- uses: actions/checkout@v6
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@v5
19+
- uses: actions/checkout@v6
2020
- name: Use JDK 21
2121
uses: actions/setup-java@v5
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@v5
63+
- uses: actions/checkout@v6
6464
- name: Use JDK 21
6565
uses: actions/setup-java@v5
6666
with:

‎.github/workflows/quality.yml‎

Lines changed: 11 additions & 11 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@v5
20+
- uses: actions/checkout@v6
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,7 +33,7 @@ jobs:
3333
name: Search for invalid screenshot files
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737
- name: Set up Python 3.12
3838
uses: actions/setup-python@v6
3939
with:
@@ -45,7 +45,7 @@ jobs:
4545
name: Search for invalid dependencies
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
- name: Use JDK 21
5050
uses: actions/setup-java@v5
5151
with:
@@ -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@v5
74+
- uses: actions/checkout@v6
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-compose-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-compose-develop-{0}', github.sha) || format('check-compose-{0}', github.ref) }}
112112
cancel-in-progress: true
113113
steps:
114-
- uses: actions/checkout@v5
114+
- uses: actions/checkout@v6
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
@@ -144,7 +144,7 @@ jobs:
144144
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) }}
145145
cancel-in-progress: true
146146
steps:
147-
- uses: actions/checkout@v5
147+
- uses: actions/checkout@v6
148148
with:
149149
# Ensure we are building the branch and not the branch after being merged on develop
150150
# https://github.com/actions/checkout/issues/881
@@ -188,7 +188,7 @@ jobs:
188188
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) }}
189189
cancel-in-progress: true
190190
steps:
191-
- uses: actions/checkout@v5
191+
- uses: actions/checkout@v6
192192
with:
193193
# Ensure we are building the branch and not the branch after being merged on develop
194194
# https://github.com/actions/checkout/issues/881
@@ -228,7 +228,7 @@ jobs:
228228
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) }}
229229
cancel-in-progress: true
230230
steps:
231-
- uses: actions/checkout@v5
231+
- uses: actions/checkout@v6
232232
with:
233233
# Ensure we are building the branch and not the branch after being merged on develop
234234
# https://github.com/actions/checkout/issues/881
@@ -268,7 +268,7 @@ jobs:
268268
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) }}
269269
cancel-in-progress: true
270270
steps:
271-
- uses: actions/checkout@v5
271+
- uses: actions/checkout@v6
272272
with:
273273
# Ensure we are building the branch and not the branch after being merged on develop
274274
# https://github.com/actions/checkout/issues/881
@@ -299,7 +299,7 @@ jobs:
299299
name: Check shell scripts
300300
runs-on: ubuntu-latest
301301
steps:
302-
- uses: actions/checkout@v5
302+
- uses: actions/checkout@v6
303303
- name: Run shellcheck
304304
uses: ludeeus/[email protected]
305305
with:
@@ -311,7 +311,7 @@ jobs:
311311
needs: [konsist, lint, ktlint, detekt]
312312
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
313313
steps:
314-
- uses: actions/checkout@v5
314+
- uses: actions/checkout@v6
315315
with:
316316
# Ensure we are building the branch and not the branch after being merged on develop
317317
# 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@v5
21+
- uses: actions/checkout@v6
2222
- name: Use JDK 21
2323
uses: actions/setup-java@v5
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@v5
55+
- uses: actions/checkout@v6
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@v5
90+
- uses: actions/checkout@v6
9191
- name: Use JDK 21
9292
uses: actions/setup-java@v5
9393
with:

‎.github/workflows/sonar.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
group: ${{ format('sonar-{0}', github.ref) }}
2323
cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
with:
2727
# Ensure we are building the branch and not the branch after being merged on develop
2828
# https://github.com/actions/checkout/issues/881

0 commit comments

Comments
 (0)