-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/1.6.0' into main
- Loading branch information
Showing
583 changed files
with
26,881 additions
and
15,274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| **/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text | ||
| **/src/androidTest/assets/*.realm filter=lfs diff=lfs merge=lfs -text | ||
| **/matrix-rust-sdk-crypto.aar filter=lfs diff=lfs merge=lfs -text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| name: ER APK Build | ||
|
|
||
| on: | ||
| pull_request: { } | ||
| push: | ||
| branches: [ develop ] | ||
|
|
||
| # Enrich gradle.properties for CI/CD | ||
| env: | ||
| GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false | ||
| CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon | ||
|
|
||
| jobs: | ||
| debug: | ||
| name: Build debug APKs ER | ||
| runs-on: ubuntu-latest | ||
| if: github.ref != 'refs/heads/main' | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| target: [ Gplay, Fdroid ] | ||
| # Allow all jobs on develop. Just one per PR. | ||
| concurrency: | ||
| group: ${{ github.ref == 'refs/heads/develop' && format('elementr-{0}-{1}', matrix.target, github.sha) || format('build-er-debug-{0}-{1}', matrix.target, github.ref) }} | ||
| cancel-in-progress: true | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/cache@v3 | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Assemble ${{ matrix.target }} debug apk | ||
| run: ./gradlew assemble${{ matrix.target }}RustCryptoDebug $CI_GRADLE_ARG_PROPERTIES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: Build and release Element R nightly APK | ||
|
|
||
| on: | ||
| schedule: | ||
| # Every nights at 4 | ||
| - cron: "0 4 * * *" | ||
|
|
||
| env: | ||
| GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false | ||
| CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon | ||
|
|
||
| jobs: | ||
| nightly: | ||
| name: Build and publish ER nightly Gplay APK to Firebase | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up Python 3.8 | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.8 | ||
| - uses: actions/cache@v3 | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Install towncrier | ||
| run: | | ||
| python3 -m pip install towncrier | ||
| - name: Prepare changelog file | ||
| run: | | ||
| mv towncrier.toml towncrier.toml.bak | ||
| sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml | ||
| rm towncrier.toml.bak | ||
| yes n | towncrier build --version nightly | ||
| - name: Build and upload Gplay Nightly ER APK | ||
| run: | | ||
| ./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES | ||
| env: | ||
| ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }} | ||
| ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }} | ||
| ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD }} | ||
| FIREBASE_TOKEN: ${{ secrets.ELEMENT_R_NIGHTLY_FIREBASE_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| name: Test | ||
|
|
||
| on: | ||
| pull_request: { } | ||
| push: | ||
| branches: [ main, develop ] | ||
| paths-ignore: | ||
| - '.github/**' | ||
|
|
||
| # Enrich gradle.properties for CI/CD | ||
| env: | ||
| GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false | ||
| CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon | ||
|
|
||
| jobs: | ||
| tests: | ||
| name: Runs all tests with rust crypto | ||
| runs-on: buildjet-4vcpu-ubuntu-2204 | ||
| timeout-minutes: 90 # We might need to increase it if the time for tests grows | ||
| strategy: | ||
| matrix: | ||
| api-level: [28] | ||
| # Allow all jobs on main and develop. Just one per PR. | ||
| concurrency: | ||
| group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-rust-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-rust-{0}', github.sha) || format('unit-tests-rust-{0}', github.ref) }} | ||
| cancel-in-progress: true | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| lfs: true | ||
| fetch-depth: 0 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'adopt' | ||
| java-version: '11' | ||
| - uses: gradle/gradle-build-action@v2 | ||
| with: | ||
| cache-read-only: ${{ github.ref != 'refs/heads/develop' }} | ||
| gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }} | ||
|
|
||
| # - name: Run screenshot tests | ||
| # run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES | ||
|
|
||
| # - name: Archive Screenshot Results on Error | ||
| # if: failure() | ||
| # uses: actions/upload-artifact@v3 | ||
| # with: | ||
| # name: screenshot-results | ||
| # path: | | ||
| # **/out/failures/ | ||
| # **/build/reports/tests/*UnitTest/ | ||
|
|
||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.8 | ||
| - uses: michaelkaye/[email protected] | ||
| with: | ||
| uploadLogs: true | ||
| httpPort: 8080 | ||
| disableRateLimiting: true | ||
| public_baseurl: "http://10.0.2.2:8080/" | ||
|
|
||
| - name: Run all the codecoverage tests at once | ||
| uses: reactivecircus/android-emulator-runner@v2 | ||
| # continue-on-error: true | ||
| with: | ||
| api-level: ${{ matrix.api-level }} | ||
| arch: x86 | ||
| profile: Nexus 5X | ||
| target: playstore | ||
| force-avd-creation: false | ||
| emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none | ||
| disable-animations: true | ||
| # emulator-build: 7425822 | ||
| script: | | ||
| ./gradlew gatherGplayRustCryptoDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES | ||
| ./gradlew instrumentationTestsRustWithCoverage $CI_GRADLE_ARG_PROPERTIES | ||
| ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES | ||
| - name: Upload Rust Integration Test Report Log | ||
| uses: actions/upload-artifact@v3 | ||
| if: always() | ||
| with: | ||
| name: integration-test-rust-error-results | ||
| path: | | ||
| */build/outputs/androidTest-results/connected/ | ||
| */build/reports/androidTests/connected/ | ||
| # For now ignore sonar | ||
| # - name: Publish results to Sonar | ||
| # env: | ||
| # GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }} # Needed to get PR information, if any | ||
| # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| # ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }} | ||
| # if: ${{ always() && env.GITHUB_TOKEN != '' && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }} | ||
| # run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES | ||
|
|
||
| - name: Format unit test results | ||
| if: always() | ||
| run: python3 ./tools/ci/render_test_output.py unit ./**/build/test-results/**/*.xml | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.