Skip to content

Commit 5a2d19f

Browse files
committed
Merge branch 'release/0.5.0' into main
2 parents 92dc7a3 + e6d2ae2 commit 5a2d19f

File tree

558 files changed

+8869
-3372
lines changed

Some content is hidden

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

558 files changed

+8869
-3372
lines changed

.github/pull_request_template.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
22

3-
## Type of change
4-
5-
- [ ] Feature
6-
- [ ] Bugfix
7-
- [ ] Technical
8-
- [ ] Other :
9-
103
## Content
114

125
<!-- Describe shortly what has been changed -->

.github/workflows/build_enterprise.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Build Enterprise APKs
1818
runs-on: ubuntu-latest
1919
# Skip in forks
20-
if: github.repository == 'element-hq/element-x-android'
20+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
2121
strategy:
2222
matrix:
2323
variant: [debug, release, nightly]

.github/workflows/danger.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
name: Danger main check
9+
# Skip in forks, it doesn't work even with the fallback token
10+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
911
steps:
1012
- uses: actions/checkout@v4
1113
- name: Add SSH private keys for submodule repositories
1214
uses: webfactory/[email protected]
1315
with:
1416
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
1517
- name: Clone submodules
16-
if: github.repository == 'element-hq/element-x-android'
18+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1719
run: git submodule update --init --recursive
1820
- run: |
1921
npm install --save-dev @babel/plugin-transform-flow-strip-types

.github/workflows/generate_github_pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
generate-github-pages:
1010
runs-on: ubuntu-latest
1111
# Skip in forks
12-
if: github.repository == 'element-hq/element-x-android'
12+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1313
steps:
1414
- name: ⏬ Checkout with LFS
1515
uses: nschloe/[email protected]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Update Gradle Wrapper
1313
uses: gradle-update/update-gradle-wrapper-action@v1
1414
# Skip in forks
15-
if: github.repository == 'element-hq/element-x-android'
15+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
target-branch: develop

.github/workflows/quality.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- name: Add SSH private keys for submodule repositories
2222
uses: webfactory/[email protected]
23+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
2324
with:
2425
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
2526
- name: Clone submodules
26-
if: github.repository == 'element-hq/element-x-android'
27+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
2728
run: git submodule update --init --recursive
2829
- name: Run code quality check suite
2930
run: ./tools/check/check_code_quality.sh
@@ -77,10 +78,11 @@ jobs:
7778
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
7879
- name: Add SSH private keys for submodule repositories
7980
uses: webfactory/[email protected]
81+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
8082
with:
8183
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
8284
- name: Clone submodules
83-
if: github.repository == 'element-hq/element-x-android'
85+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
8486
run: git submodule update --init --recursive
8587
- name: Use JDK 17
8688
uses: actions/setup-java@v4
@@ -116,10 +118,11 @@ jobs:
116118
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
117119
- name: Add SSH private keys for submodule repositories
118120
uses: webfactory/[email protected]
121+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
119122
with:
120123
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
121124
- name: Clone submodules
122-
if: github.repository == 'element-hq/element-x-android'
125+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
123126
run: git submodule update --init --recursive
124127
- name: Use JDK 17
125128
uses: actions/setup-java@v4
@@ -159,10 +162,11 @@ jobs:
159162
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
160163
- name: Add SSH private keys for submodule repositories
161164
uses: webfactory/[email protected]
165+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
162166
with:
163167
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
164168
- name: Clone submodules
165-
if: github.repository == 'element-hq/element-x-android'
169+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
166170
run: git submodule update --init --recursive
167171
- name: Use JDK 17
168172
uses: actions/setup-java@v4
@@ -198,10 +202,11 @@ jobs:
198202
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
199203
- name: Add SSH private keys for submodule repositories
200204
uses: webfactory/[email protected]
205+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
201206
with:
202207
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
203208
- name: Clone submodules
204-
if: github.repository == 'element-hq/element-x-android'
209+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
205210
run: git submodule update --init --recursive
206211
- name: Use JDK 17
207212
uses: actions/setup-java@v4
@@ -237,10 +242,11 @@ jobs:
237242
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
238243
- name: Add SSH private keys for submodule repositories
239244
uses: webfactory/[email protected]
245+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
240246
with:
241247
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
242248
- name: Clone submodules
243-
if: github.repository == 'element-hq/element-x-android'
249+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
244250
run: git submodule update --init --recursive
245251
- name: Use JDK 17
246252
uses: actions/setup-java@v4
@@ -271,6 +277,7 @@ jobs:
271277
name: Project Check Suite
272278
runs-on: ubuntu-latest
273279
needs: [konsist, lint, ktlint, detekt]
280+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
274281
steps:
275282
- uses: actions/checkout@v4
276283
with:

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@ jobs:
4242
enterprise:
4343
name: Create App Bundle Enterprise
4444
runs-on: ubuntu-latest
45+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4546
concurrency:
4647
group: ${{ format('build-release-main-gplay-{0}', github.sha) }}
4748
cancel-in-progress: true
4849
steps:
4950
- uses: actions/checkout@v4
5051
- name: Add SSH private keys for submodule repositories
5152
uses: webfactory/[email protected]
53+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
5254
with:
5355
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
5456
- name: Clone submodules

.github/workflows/sync-localazy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
sync-localazy:
1010
runs-on: ubuntu-latest
1111
# Skip in forks
12-
if: github.repository == 'element-hq/element-x-android'
12+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Use JDK 17

.github/workflows/sync-sas-strings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
sync-sas-strings:
1010
runs-on: ubuntu-latest
1111
# Skip in forks
12-
if: github.repository == 'element-hq/element-x-android'
12+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1313
# No concurrency required, runs every time on a schedule.
1414
steps:
1515
- uses: actions/checkout@v4

.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ jobs:
4040
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
4141
- name: Add SSH private keys for submodule repositories
4242
uses: webfactory/[email protected]
43+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4344
with:
4445
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
4546
- name: Clone submodules
46-
if: github.repository == 'element-hq/element-x-android'
47+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4748
run: git submodule update --init --recursive
4849
- name: ☕️ Use JDK 17
4950
uses: actions/setup-java@v4

0 commit comments

Comments
 (0)