Skip to content

Commit 141cac7

Browse files
committed
Merge branch 'release/0.2.0' into main
2 parents fc40f69 + 5886e6b commit 141cac7

File tree

995 files changed

+13374
-3246
lines changed

Some content is hidden

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

995 files changed

+13374
-3246
lines changed

.github/workflows/build.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-{0}-{1}', matrix.variant, github.sha) || format('build-{0}-{1}', matrix.variant, github.ref) }}
2828
cancel-in-progress: true
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
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
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
name: Danger main check
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
update-gradle-wrapper:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Update Gradle Wrapper
1313
uses: gradle-update/update-gradle-wrapper-action@v1
1414
# Skip in forks

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
runs-on: ubuntu-latest
1212
# No concurrency required, this is a prerequisite to other actions and should run every time.
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: gradle/wrapper-validation-action@v1

.github/workflows/maestro.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
group: ${{ format('maestro-{0}', github.ref) }}
2525
cancel-in-progress: true
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
# Ensure we are building the branch and not the branch after being merged on develop
3030
# https://github.com/actions/checkout/issues/881

.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 == 'vector-im/element-x-android' }}
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Use JDK 17
2121
uses: actions/setup-java@v3
2222
with:

.github/workflows/nightlyReports.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
name: Dependency analysis
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959
- name: Use JDK 17
6060
uses: actions/setup-java@v3
6161
with:

.github/workflows/quality.yml

Lines changed: 2 additions & 8 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@v3
20+
- uses: actions/checkout@v4
2121
- name: Run code quality check suite
2222
run: ./tools/check/check_code_quality.sh
2323

@@ -29,7 +29,7 @@ jobs:
2929
group: ${{ github.ref == 'refs/heads/main' && format('check-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-develop-{0}', github.sha) || format('check-{0}', github.ref) }}
3030
cancel-in-progress: true
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
with:
3434
# Ensure we are building the branch and not the branch after being merged on develop
3535
# https://github.com/actions/checkout/issues/881
@@ -52,12 +52,6 @@ jobs:
5252
name: linting-report
5353
path: |
5454
*/build/reports/**/*.*
55-
- name: 🔊 Publish results to Sonar
56-
env:
57-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
58-
ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
59-
if: ${{ always() && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
60-
run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
6155
- name: Prepare Danger
6256
if: always()
6357
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
group: ${{ github.ref == 'refs/head/main' && format('build-release-main-{0}', github.sha) }}
1919
cancel-in-progress: true
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Use JDK 17
2323
uses: actions/setup-java@v3
2424
with:

.github/workflows/sonar.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code Quality Checks
1+
name: Sonar
22

33
on:
44
workflow_dispatch:
@@ -10,18 +10,18 @@ on:
1010
# Enrich gradle.properties for CI/CD
1111
env:
1212
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
13-
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon --warn
13+
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon --warn
1414

1515
jobs:
1616
sonar:
17-
name: Project Check Suite
17+
name: Sonar Quality Checks
1818
runs-on: ubuntu-latest
1919
# Allow all jobs on main and develop. Just one per PR.
2020
concurrency:
2121
group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
2222
cancel-in-progress: true
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
# Ensure we are building the branch and not the branch after being merged on develop
2727
# https://github.com/actions/checkout/issues/881
@@ -41,9 +41,3 @@ jobs:
4141
ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
4242
if: ${{ always() && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
4343
run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
44-
- name: Prepare Danger
45-
if: always()
46-
run: |
47-
npm install --save-dev @babel/core
48-
npm install --save-dev @babel/plugin-transform-flow-strip-types
49-
yarn add danger-plugin-lint-report --dev

0 commit comments

Comments
 (0)