From 5b0873516c5ecf86e6cc4dff95f087410599b1a1 Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:40:36 +0100
Subject: [PATCH 1/2] Attempt to fix duplicate releases issue (#18025)

This hopefully fixes https://github.com/element-hq/synapse/issues/17991,
as we first upgraded to v2 and are now back to 0.1.15.
(This was lost in https://github.com/element-hq/synapse/pull/17923,
related https://github.com/element-hq/synapse/pull/17995)
---
 .github/workflows/release-artifacts.yml | 4 ++++
 changelog.d/18025.misc                  | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 changelog.d/18025.misc

diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index 5b5bfc1896..10583bc060 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -221,3 +221,7 @@ jobs:
             Sdist/*
             Wheel*/*
             debs.tar.xz
+          # if it's not already published, keep the release as a draft.
+          draft: true
+          # mark it as a prerelease if the tag contains 'rc'.
+          prerelease: ${{ contains(github.ref, 'rc') }}
diff --git a/changelog.d/18025.misc b/changelog.d/18025.misc
new file mode 100644
index 0000000000..835079de3f
--- /dev/null
+++ b/changelog.d/18025.misc
@@ -0,0 +1 @@
+Fix release process to not create duplicate releases.

From ed6edc17d0bef167b0833d962e7abaf2449a21ef Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:12:50 +0100
Subject: [PATCH 2/2] 1.121.0

---
 CHANGES.md             | 9 +++++++++
 changelog.d/18025.misc | 1 -
 debian/changelog       | 6 ++++++
 pyproject.toml         | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/18025.misc

diff --git a/CHANGES.md b/CHANGES.md
index 20177bf00a..6096463cc6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# Synapse 1.121.0 (2024-12-11)
+
+### Internal Changes
+
+- Fix release process to not create duplicate releases. ([\#18025](https://github.com/element-hq/synapse/issues/18025))
+
+
+
+
 # Synapse 1.121.0rc1 (2024-12-04)
 
 This release candidate contains the security fixes from [v1.120.2](https://github.com/element-hq/synapse/releases/tag/v1.120.2).
diff --git a/changelog.d/18025.misc b/changelog.d/18025.misc
deleted file mode 100644
index 835079de3f..0000000000
--- a/changelog.d/18025.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix release process to not create duplicate releases.
diff --git a/debian/changelog b/debian/changelog
index 805c036c82..8149cd7486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.121.0) stable; urgency=medium
+
+  * New Synapse release 1.121.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 11 Dec 2024 13:12:30 +0100
+
 matrix-synapse-py3 (1.121.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.121.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index e5051770f5..a8a86b4d5c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.121.0rc1"
+version = "1.121.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"