Merge branch 'master' into develop
5 files changed, 36 insertions, 5 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ebf866e3d5..82cacdfeb3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ permissions:
id-token: write # needed for signing the images with GitHub OIDC Token
jobs:
build:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- name: Set up QEMU
id: qemu
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/CHANGES.md b/CHANGES.md
index 20177bf00a..116f48d2e0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,23 @@
-# Synapse 1.121.0rc1 (2024-12-04)
+# Synapse 1.121.1 (2024-12-11)
+
+This release contains a fix for our docker build CI. It is functionally identical to 1.121.0, whose changelog is below.
+
+### Internal Changes
+
+- Downgrade the Ubuntu GHA runner when building docker images. ([\#18026](https://github.com/element-hq/synapse/issues/18026))
+
+
-This release candidate contains the security fixes from [v1.120.2](https://github.com/element-hq/synapse/releases/tag/v1.120.2).
-New changes listed below.
+# 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)
### Features
diff --git a/debian/changelog b/debian/changelog
index 805c036c82..fc34d8ac3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+matrix-synapse-py3 (1.121.1) stable; urgency=medium
+
+ * New Synapse release 1.121.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Wed, 11 Dec 2024 18:24:48 +0000
+
+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..0430371586 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.1"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "AGPL-3.0-or-later"
|
