Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

INGRESS_INTEGRATION_NAME = "ingress"
# This constant is updated by Renovate.
SYNAPSE_VERSION = "1.139.2"
SYNAPSE_VERSION = "1.140.0"


class SynapseCharm(CharmBaseWithState):
Expand Down
8 changes: 2 additions & 6 deletions synapse_rock/rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ parts:
plugin: nil
source: https://github.com/element-hq/synapse/
source-type: git
source-tag: v1.139.2
source-tag: v1.140.0
build-environment:
- RUST_VERSION: "1.82.0"
- POETRY_VERSION: "2.1.1"
Expand Down Expand Up @@ -135,7 +135,7 @@ parts:
cd ..
#
# install s3 storage provider
git clone --branch v1.4.0 --depth 1 https://github.com/matrix-org/synapse-s3-storage-provider
git clone --branch v1.6.0 --depth 1 https://github.com/matrix-org/synapse-s3-storage-provider
cd synapse-s3-storage-provider
pip3 install --break-system-packages --prefix="/install" --no-warn-script-location -U .
cd ..
Expand All @@ -152,10 +152,6 @@ parts:
cp -r rust /synapse/
cp pyproject.toml README.rst build_rust.py Cargo.toml Cargo.lock /synapse/
pip3 install --break-system-packages --prefix="/install" --no-deps --no-warn-script-location /synapse[all];
# fix issue while upload media to s3
# boto3 is installed by synapse-s3-storage-provider
# https://github.com/boto/boto3/issues/4398
pip3 install --break-system-packages --prefix="/install" --force-reinstall -v "boto3==1.35.99"
cp docker/start.py $CRAFT_PART_INSTALL/
chmod 755 $CRAFT_PART_INSTALL/start.py
cp -r docker/conf $CRAFT_PART_INSTALL/
Expand Down
1 change: 1 addition & 0 deletions tests/unit_harness/test_synapse_workload.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ def test_generate_mjolnir_config_success(monkeypatch: pytest.MonkeyPatch):
synapse.MJOLNIR_CONFIG_PATH, yaml.safe_dump(expected_config), make_dirs=True
)


# Uppercase seems to be the correct styling for a test global constant.
# pylint: disable=invalid-name
SMTP_CONFIGURATION = SMTPConfiguration(
Expand Down
Loading