Skip to content

Commit bee248e

Browse files
ganfraganfra
committed
Merge branch 'release/25.03.2' into main
2 parents 232f1db + a3ab1db commit bee248e

File tree

942 files changed

+9088
-3510
lines changed

Some content is hidden

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

942 files changed

+9088
-3510
lines changed

‎.github/workflows/blocked.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
retention-days: 5
6666
overwrite: true
6767
if-no-files-found: error
68-
- uses: rnkdsh/[email protected].6
68+
- uses: rnkdsh/[email protected].7
6969
id: diawi
7070
# Do not fail the whole build if Diawi upload fails
7171
continue-on-error: true
@@ -89,7 +89,7 @@ jobs:
8989
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9090
- name: Compile release sources
9191
if: ${{ matrix.variant == 'release' }}
92-
run: ./gradlew compileReleaseSources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
92+
run: ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
9393
- name: Compile nightly sources
9494
if: ${{ matrix.variant == 'nightly' }}
9595
run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES

‎.github/workflows/build_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# https://github.com/actions/checkout/issues/881
3434
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
3535
- name: Add SSH private keys for submodule repositories
36-
uses: webfactory/[email protected].0
36+
uses: webfactory/[email protected].1
3737
with:
3838
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
3939
- name: Clone submodules

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Add SSH private keys for submodule repositories
14-
uses: webfactory/[email protected].0
14+
uses: webfactory/[email protected].1
1515
with:
1616
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
1717
- name: Clone submodules

‎.github/workflows/nightly_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Add SSH private keys for submodule repositories
21-
uses: webfactory/[email protected].0
21+
uses: webfactory/[email protected].1
2222
with:
2323
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
2424
- name: Clone submodules

‎.github/workflows/pull_request.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Pull Request
2+
on:
3+
pull_request:
4+
types: [ opened, edited, labeled, unlabeled, synchronize ]
5+
workflow_call:
6+
secrets:
7+
ELEMENT_BOT_TOKEN:
8+
required: true
9+
10+
jobs:
11+
prevent-blocked:
12+
name: Prevent blocked
13+
runs-on: ubuntu-latest
14+
permissions:
15+
pull-requests: read
16+
steps:
17+
- name: Add notice
18+
uses: actions/github-script@v7
19+
if: contains(github.event.pull_request.labels.*.name, 'X-Blocked')
20+
with:
21+
script: |
22+
core.setFailed("PR has been labeled with X-Blocked; it cannot be merged.");
23+
24+
community-prs:
25+
name: Label Community PRs
26+
runs-on: ubuntu-latest
27+
if: github.event.action == 'opened'
28+
permissions:
29+
pull-requests: write
30+
steps:
31+
- name: Check membership
32+
if: github.event.pull_request.user.login != 'renovate[bot]'
33+
uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3
34+
id: teams
35+
with:
36+
username: ${{ github.event.pull_request.user.login }}
37+
organization: element-hq
38+
team: Vector Core
39+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN_READ_ORG }}
40+
- name: Add label
41+
if: steps.teams.outputs.isTeamMember == 'false'
42+
uses: actions/github-script@v7
43+
with:
44+
script: |
45+
github.rest.issues.addLabels({
46+
issue_number: context.issue.number,
47+
owner: context.repo.owner,
48+
repo: context.repo.repo,
49+
labels: ['Z-Community-PR']
50+
});
51+
52+
close-if-fork-develop:
53+
name: Forbid develop branch fork contributions
54+
runs-on: ubuntu-latest
55+
if: >
56+
github.event.action == 'opened' &&
57+
github.event.pull_request.head.ref == 'develop' &&
58+
github.event.pull_request.head.repo.full_name != github.repository
59+
steps:
60+
- name: Close pull request
61+
uses: actions/github-script@v7
62+
with:
63+
script: |
64+
github.rest.issues.createComment({
65+
issue_number: context.issue.number,
66+
owner: context.repo.owner,
67+
repo: context.repo.repo,
68+
body: "Thanks for opening this pull request, unfortunately we do not accept contributions from the main" +
69+
" branch of your fork, please re-open once you switch to an alternative branch for everyone's sanity.",
70+
});
71+
72+
github.rest.pulls.update({
73+
pull_number: context.issue.number,
74+
owner: context.repo.owner,
75+
repo: context.repo.repo,
76+
state: 'closed'
77+
});

‎.github/workflows/quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Add SSH private keys for submodule repositories
22-
uses: webfactory/[email protected].0
22+
uses: webfactory/[email protected].1
2323
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
2424
with:
2525
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -77,7 +77,7 @@ jobs:
7777
# https://github.com/actions/checkout/issues/881
7878
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
7979
- name: Add SSH private keys for submodule repositories
80-
uses: webfactory/[email protected].0
80+
uses: webfactory/[email protected].1
8181
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
8282
with:
8383
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -117,7 +117,7 @@ jobs:
117117
# https://github.com/actions/checkout/issues/881
118118
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
119119
- name: Add SSH private keys for submodule repositories
120-
uses: webfactory/[email protected].0
120+
uses: webfactory/[email protected].1
121121
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
122122
with:
123123
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -161,7 +161,7 @@ jobs:
161161
# https://github.com/actions/checkout/issues/881
162162
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
163163
- name: Add SSH private keys for submodule repositories
164-
uses: webfactory/[email protected].0
164+
uses: webfactory/[email protected].1
165165
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
166166
with:
167167
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -201,7 +201,7 @@ jobs:
201201
# https://github.com/actions/checkout/issues/881
202202
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
203203
- name: Add SSH private keys for submodule repositories
204-
uses: webfactory/[email protected].0
204+
uses: webfactory/[email protected].1
205205
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
206206
with:
207207
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -241,7 +241,7 @@ jobs:
241241
# https://github.com/actions/checkout/issues/881
242242
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
243243
- name: Add SSH private keys for submodule repositories
244-
uses: webfactory/[email protected].0
244+
uses: webfactory/[email protected].1
245245
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
246246
with:
247247
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v4
5252
- name: Add SSH private keys for submodule repositories
53-
uses: webfactory/[email protected].0
53+
uses: webfactory/[email protected].1
5454
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
5555
with:
5656
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# https://github.com/actions/checkout/issues/881
4040
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
4141
- name: Add SSH private keys for submodule repositories
42-
uses: webfactory/[email protected].0
42+
uses: webfactory/[email protected].1
4343
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4444
with:
4545
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ captures/
4343
.idea/.name
4444
.idea/androidTestResultsUserPreferences.xml
4545
.idea/assetWizardSettings.xml
46+
.idea/AndroidProjectSystem.xml
4647
.idea/compiler.xml
4748
.idea/deploymentTargetDropDown.xml
4849
.idea/deploymentTargetSelector.xml

0 commit comments

Comments
 (0)