Skip to content

Commit

Permalink
Merge branch 'release/2.13.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
yostyle committed Oct 31, 2024
2 parents b6ee9d3 + 29f3724 commit cf54519
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 16 deletions.
9 changes: 8 additions & 1 deletion TCHAP_CHANGES.md
Original file line number Diff line number Diff line change
@@ -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)
====================================
Expand Down
36 changes: 24 additions & 12 deletions tools/release/download_github_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion towncrier.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion vector-config/src/tchap/res/values/config-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<bool name="tchap_is_cross_signing_enabled">true</bool>
<bool name="tchap_is_key_backup_enabled">true</bool>
<bool name="tchap_is_thread_enabled">false</bool>
<bool name="tchap_is_secure_backup_required">false</bool>
<bool name="tchap_is_secure_backup_required">true</bool>

<string-array name="tchap_is_visio_supported_homeservers" translatable="false">
<item>agent.dinum.tchap.gouv.fr</item>
<item>agent.education.tchap.gouv.fr</item>
<item>agent.tchap.gouv.fr</item>
<item>agent.intradef.tchap.gouv.fr</item>
</string-array>
</resources>

0 comments on commit cf54519

Please sign in to comment.