From 43afef84930c96bf5655150b3609b77e9fdc0377 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Thu, 22 Sep 2022 17:05:52 +0200 Subject: [PATCH 1/8] Prepare hotfix version 2.4.3 --- towncrier.toml | 2 +- vector/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/towncrier.toml b/towncrier.toml index c8ea516789..207ccd8b57 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.4.2" + version = "2.4.3" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector/build.gradle b/vector/build.gradle index 8c3ffaf207..4937832415 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -35,7 +35,7 @@ ext.versionMinor = 4 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -ext.versionPatch = 2 +ext.versionPatch = 3 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From 5b40c66891b1ec49fe14fbfba6873733a938fc9a Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Tue, 30 Aug 2022 10:02:07 +0200 Subject: [PATCH 2/8] Github Action - Fix exodus build step (cherry picked from commit 324550c3f7fa2e6e24cfd21a5433ead66b909255) --- .github/workflows/build.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d602f0191..b832aa4e21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,6 @@ jobs: fail-fast: false matrix: target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] - # Only runs on main, no concurrency. concurrency: group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }} cancel-in-progress: ${{ github.ref != 'refs/head/main' }} @@ -80,18 +79,26 @@ jobs: exodus: runs-on: ubuntu-latest needs: release + env: + # Tchap: custom fields + TARGET_NAME: "GplayTchapWithoutvoipWithpinning" + TARGET_FOLDER: "gplayTchapWithoutvoipWithpinning" steps: - name: Obtain apk from artifact id: download uses: actions/download-artifact@v3 with: - name: vector-gplay-release-unsigned + name: ${{ env.TARGET_NAME }}-release-unsigned - name: Show apks in artifact - run: ls -R ${{steps.download.outputs.download-path}} + id: list-apks + # Tchap: Find apks in artifacts + run: | + ls -R ${{steps.download.outputs.download-path}} | grep ".apk" + echo ::set-output name=FIRST_APK_NAME::$(ls -R ${{steps.download.outputs.download-path}} | grep ".apk" | head -1) - name: Execute exodus-standalone uses: docker://exodusprivacy/exodus-standalone:latest with: - args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json + args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json - name: Upload exodus json report uses: actions/upload-artifact@v3 with: From bbc7f40b7bc7c562d6c75ea86cf224be253da7b7 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Thu, 1 Sep 2022 11:40:02 +0200 Subject: [PATCH 3/8] Fix concurrency condition in apk builds (cherry picked from commit 2d1115f4a2ab59a2667373e13c901a6aef7f2659) --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b832aa4e21..d542ca5e76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,8 +55,9 @@ jobs: matrix: target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }} - cancel-in-progress: ${{ github.ref != 'refs/head/main' }} + # Tchap: custom group + group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v' && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }} + cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v'}} steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -80,7 +81,7 @@ jobs: runs-on: ubuntu-latest needs: release env: - # Tchap: custom fields + # Tchap: only generate exodus report for the following target TARGET_NAME: "GplayTchapWithoutvoipWithpinning" TARGET_FOLDER: "gplayTchapWithoutvoipWithpinning" steps: From 5ca04b3c1ad143a0859d2ae559a94768ea4d8f15 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Fri, 9 Sep 2022 16:43:28 +0200 Subject: [PATCH 4/8] Add changelog (cherry picked from commit 95ef3bc76c1e0164583c83f40d19cb94b1297a74) --- changelog.d/724.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/724.misc diff --git a/changelog.d/724.misc b/changelog.d/724.misc new file mode 100644 index 0000000000..5342bdb3b2 --- /dev/null +++ b/changelog.d/724.misc @@ -0,0 +1 @@ +CI - Fix build APKs script From d0a8ec02592c3749bcda8590aabab2f245235fc0 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Tue, 20 Sep 2022 16:57:15 +0200 Subject: [PATCH 5/8] Fix malformed build.yml script (cherry picked from commit fa64bc36da307214ce8c10d75456f3a57d034dcb) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d542ca5e76..e9cc7f9347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: pull_request: { } push: branches: [ main, develop ] - tags: [tchap_v*] + tags: [ tchap_v* ] # Enrich gradle.properties for CI/CD env: @@ -56,8 +56,8 @@ jobs: target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] concurrency: # Tchap: custom group - group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v' && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }} - cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v'}} + group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v') && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }} + cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v') }} steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 From 7bc8a221291c2b9d5be2508e4b88d92476a117bd Mon Sep 17 00:00:00 2001 From: Didier Nizard Date: Fri, 23 Sep 2022 14:39:08 +0200 Subject: [PATCH 6/8] Bug fix #672 Restore the identity server definition --- changelog.d/672.bugfix | 1 + .../java/im/vector/app/features/home/HomeActivityViewModel.kt | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changelog.d/672.bugfix diff --git a/changelog.d/672.bugfix b/changelog.d/672.bugfix new file mode 100644 index 0000000000..af1ab37ab7 --- /dev/null +++ b/changelog.d/672.bugfix @@ -0,0 +1 @@ +Create DM by selecting an email is not working anymore diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index 10493fee15..ef9d47d7ee 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt @@ -235,6 +235,9 @@ class HomeActivityViewModel @AssistedInject constructor( .onEach { status -> when (status) { is SyncRequestState.Idle -> { + // Tchap edition : Force Identity server definition + updateIdentityServer() + maybeVerifyOrBootstrapCrossSigning() } else -> Unit From cfc7f7000b3e29267b4ca310018c46ca92ff0bbc Mon Sep 17 00:00:00 2001 From: Didier Nizard Date: Fri, 23 Sep 2022 14:48:08 +0200 Subject: [PATCH 7/8] Increase build version factor --- vector/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index 4937832415..e0b7ad6aca 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -224,7 +224,8 @@ android { applicationVariants.all { variant -> // assign different version code for each output - def baseVariantVersion = variant.versionCode * 10 + // Tchap : Increase the factor from 10 to 100 due to Neo users integration + def baseVariantVersion = variant.versionCode * 100 variant.outputs.each { output -> def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) // Known limitation: it does not modify the value in the BuildConfig.java generated file From ec365b02509b5e76c33b9e60d6682971aa7b7978 Mon Sep 17 00:00:00 2001 From: Didier Nizard Date: Fri, 23 Sep 2022 14:56:18 +0200 Subject: [PATCH 8/8] Update changelogs --- TCHAP_CHANGES.md | 12 ++++++++++++ changelog.d/672.bugfix | 1 - changelog.d/724.misc | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/672.bugfix delete mode 100644 changelog.d/724.misc diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index ec50fc1d62..5b74bf6f8e 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,15 @@ +Changes in Tchap 2.4.3 (2022-09-23) +=================================== + +Bugfixes 🐛 +---------- + - Create DM by selecting an email is not working anymore ([#672](https://github.com/tchapgouv/tchap-android-v2/issues/672)) + +Other changes +------------- + - CI - Fix build APKs script ([#724](https://github.com/tchapgouv/tchap-android-v2/issues/724)) + + Changes in Tchap 2.4.2 (2022-08-29) =================================== diff --git a/changelog.d/672.bugfix b/changelog.d/672.bugfix deleted file mode 100644 index af1ab37ab7..0000000000 --- a/changelog.d/672.bugfix +++ /dev/null @@ -1 +0,0 @@ -Create DM by selecting an email is not working anymore diff --git a/changelog.d/724.misc b/changelog.d/724.misc deleted file mode 100644 index 5342bdb3b2..0000000000 --- a/changelog.d/724.misc +++ /dev/null @@ -1 +0,0 @@ -CI - Fix build APKs script