summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-24 12:01:20 +0000
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-24 12:01:20 +0000
commitcf7109fc352ce7224214f719e0c3e67f7c4a7942 (patch)
tree5416bb19077c099cd79590c9695c2f642130a873
parentDowngrade the `download-artifact` and `upload-artifact` actions to v3 due to ... (diff)
downloadsynapse-cf7109fc352ce7224214f719e0c3e67f7c4a7942.tar.xz
1.100.0rc2
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/16847.misc1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4bef78409e..b91ef3d73f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,14 @@
+# Synapse 1.100.0rc2 (2024-01-24)
+
+### Internal Changes
+
+- Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes. ([\#16847](https://github.com/element-hq/synapse/issues/16847))
+
+
 # Synapse 1.100.0rc1 (2024-01-23)
 
+*This version was never released to PyPI or the Debian repository due to failures in the automatic part of the release process.*
+
 ### Features
 
 - Advertise experimental support for [MSC4028](https://github.com/matrix-org/matrix-spec-proposals/pull/4028) through `/_matrix/clients/versions` if enabled. Contributed by @hanadi92. ([\#16787](https://github.com/element-hq/synapse/issues/16787))
diff --git a/changelog.d/16847.misc b/changelog.d/16847.misc
deleted file mode 100644
index 95650f01fb..0000000000
--- a/changelog.d/16847.misc
+++ /dev/null
@@ -1 +0,0 @@
-Downgrade the `download-artifact` and `upload-artifact` actions to v3 due to breaking changes.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ca0e2aec49..5a86b6302b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.100.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.100.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 24 Jan 2024 11:59:51 +0000
+
 matrix-synapse-py3 (1.100.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.100.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 3bfbb1cc41..d4cb01f7c5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.100.0rc1"
+version = "1.100.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"