From 20e1bc2ba0af15983b1b5797e3e925d945d00d86 Mon Sep 17 00:00:00 2001 From: Yoan Pintas Date: Thu, 31 Oct 2024 15:08:45 +0100 Subject: [PATCH 1/2] Enable visio for Intradef instance (#1123) --- changelog.d/1120.feature | 1 + vector-config/src/tchap/res/values/config-features.xml | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/1120.feature diff --git a/changelog.d/1120.feature b/changelog.d/1120.feature new file mode 100644 index 0000000000..b4b264c3f1 --- /dev/null +++ b/changelog.d/1120.feature @@ -0,0 +1 @@ +Activation des appels vidéos pour Intradef en beta externe. \ No newline at end of file diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml index d84cbf38c3..3796724003 100755 --- a/vector-config/src/tchap/res/values/config-features.xml +++ b/vector-config/src/tchap/res/values/config-features.xml @@ -9,5 +9,6 @@ agent.dinum.tchap.gouv.fr agent.education.tchap.gouv.fr agent.tchap.gouv.fr + agent.intradef.tchap.gouv.fr From 29f37246e4fe6ca61a5f77e77fe116ab12b67fed Mon Sep 17 00:00:00 2001 From: yostyle Date: Thu, 31 Oct 2024 15:49:30 +0100 Subject: [PATCH 2/2] Update changes --- TCHAP_CHANGES.md | 9 ++++- changelog.d/1120.feature | 1 - tools/release/download_github_artifacts.py | 36 ++++++++++++------- towncrier.toml | 2 +- vector-app/build.gradle | 2 +- .../src/tchap/res/values/config-features.xml | 2 +- 6 files changed, 35 insertions(+), 17 deletions(-) delete mode 100644 changelog.d/1120.feature diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index 1e6a5ad5d1..e75999fc33 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,9 +1,16 @@ +Changes in Tchap 2.13.8 (2024-10-31) +==================================== + +Features ✨ +---------- + - Activation des appels vidéos pour Intradef en beta externe. ([#1120](https://github.com/tchapgouv/tchap-android/issues/1120)) + Changes in Tchap 2.13.7 (2024-10-31) ==================================== Features ✨ ---------- -- Ne pas forcer la génération du code de récupération et la sauvegarde automatique en production. + - Ne pas forcer la génération du code de récupération et la sauvegarde automatique en production. Changes in Tchap 2.13.6 (2024-10-30) ==================================== diff --git a/changelog.d/1120.feature b/changelog.d/1120.feature deleted file mode 100644 index b4b264c3f1..0000000000 --- a/changelog.d/1120.feature +++ /dev/null @@ -1 +0,0 @@ -Activation des appels vidéos pour Intradef en beta externe. \ No newline at end of file diff --git a/tools/release/download_github_artifacts.py b/tools/release/download_github_artifacts.py index fddc120762..768b3f42d4 100755 --- a/tools/release/download_github_artifacts.py +++ b/tools/release/download_github_artifacts.py @@ -22,6 +22,8 @@ import re # Run `pip3 install requests` if not installed yet import requests +# Run `pip3 install tqdm` if not installed yet +from tqdm import tqdm # This script downloads artifacts from GitHub. # Ref: https://docs.github.com/en/rest/actions/artifacts#get-an-artifact @@ -131,20 +133,30 @@ target = targetDir + "/" + filename sizeInBytes = data.get("size_in_bytes") + + # get request +response = requests.get(url, headers=headers, stream=True) + +# Sizes in bytes. +total_size = data.get("size_in_bytes") +block_size = 1024 + print("Downloading %s to '%s' (file size is %s bytes, this may take a while)..." % (filename, targetDir, sizeInBytes)) if not args.simulate: - # open file to write in binary mode - with open(target, "wb") as file: - # get request - response = requests.get(url, headers=headers) - # write to file - file.write(response.content) - print("Verifying file size...") - # get the file size - size = os.path.getsize(target) - if sizeInBytes != size: - # error = True - print("Warning, file size mismatch: expecting %s and get %s. This is just a warning for now..." % (sizeInBytes, size)) + with tqdm(total=total_size, unit="B", unit_scale=True) as progress_bar: + # open file to write in binary mode + with open(target, "wb") as file: + for data in response.iter_content(block_size): + progress_bar.update(len(data)) + # write to file + file.write(data) + + print("Verifying file size...") + # get the file size + size = os.path.getsize(target) + if sizeInBytes != size: + # error = True + print("Warning, file size mismatch: expecting %s and get %s. This is just a warning for now..." % (sizeInBytes, size)) if error: print("❌ Error(s) occurred, please check the log") diff --git a/towncrier.toml b/towncrier.toml index c5d7ddaf96..89bb42afaa 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.13.7" + version = "2.13.8" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 411df1274b..1456ee9604 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,7 +37,7 @@ ext.versionMinor = 13 // 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 = 7 +ext.versionPatch = 8 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml index 3796724003..6050a08f7c 100755 --- a/vector-config/src/tchap/res/values/config-features.xml +++ b/vector-config/src/tchap/res/values/config-features.xml @@ -3,7 +3,7 @@ true true false - false + true agent.dinum.tchap.gouv.fr