diff --git a/.ci/scripts/setup_complement_prerequisites.sh b/.ci/scripts/setup_complement_prerequisites.sh
index 3778478da6..47a3ff8e69 100755
--- a/.ci/scripts/setup_complement_prerequisites.sh
+++ b/.ci/scripts/setup_complement_prerequisites.sh
@@ -9,16 +9,6 @@ set -eu
alias block='{ set +x; } 2>/dev/null; func() { echo "::group::$*"; set -x; }; func'
alias endblock='{ set +x; } 2>/dev/null; func() { echo "::endgroup::"; set -x; }; func'
-block Set Go Version
- # The path is set via a file given by $GITHUB_PATH. We need both Go 1.17 and GOPATH on the path to run Complement.
- # See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path
-
- # Add Go 1.17 to the PATH: see https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md#environment-variables-2
- echo "$GOROOT_1_17_X64/bin" >> $GITHUB_PATH
- # Add the Go path to the PATH: We need this so we can call gotestfmt
- echo "~/go/bin" >> $GITHUB_PATH
-endblock
-
block Install Complement Dependencies
sudo apt-get -qq update && sudo apt-get install -qqy libolm3 libolm-dev
go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml
index d5a68ffa1f..c3705b059b 100644
--- a/.github/workflows/latest_deps.yml
+++ b/.github/workflows/latest_deps.yml
@@ -184,6 +184,8 @@ jobs:
with:
path: synapse
+ - uses: actions/setup-go@v4
+
- name: Prepare Complement's Prerequisites
run: synapse/.ci/scripts/setup_complement_prerequisites.sh
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a2cec324a5..f895163e51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -555,6 +555,8 @@ jobs:
toolchain: 1.58.1
- uses: Swatinem/rust-cache@v2
+ - uses: actions/setup-go@v4
+
- name: Prepare Complement's Prerequisites
run: synapse/.ci/scripts/setup_complement_prerequisites.sh
diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index 461c85067c..ad35c6b570 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -147,6 +147,8 @@ jobs:
with:
path: synapse
+ - uses: actions/setup-go@v4
+
- name: Prepare Complement's Prerequisites
run: synapse/.ci/scripts/setup_complement_prerequisites.sh
diff --git a/CHANGES.md b/CHANGES.md
index 2a6ee1490d..70f1e0cbd0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Synapse 1.81.0rc1 (2023-04-04)
+Synapse 1.81.0rc2 (2023-04-06)
==============================
Synapse now attempts the versioned appservice paths before falling back to the
@@ -14,6 +14,21 @@ A future version of Synapse (v1.88.0 or later) will remove support for legacy
application service routes and query parameter authorization.
+Bugfixes
+--------
+
+- Fix the `set_device_id_for_pushers_txn` background update crash. ([\#15391](https://github.com/matrix-org/synapse/issues/15391))
+
+
+Internal Changes
+----------------
+
+- Update CI to run complement under the latest stable go version. ([\#15403](https://github.com/matrix-org/synapse/issues/15403))
+
+
+Synapse 1.81.0rc1 (2023-04-04)
+==============================
+
Features
--------
diff --git a/debian/changelog b/debian/changelog
index c3bea01c05..850afe12a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.81.0~rc2) stable; urgency=medium
+
+ * New Synapse release 1.81.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 06 Apr 2023 16:07:54 +0100
+
matrix-synapse-py3 (1.81.0~rc1) stable; urgency=medium
* New Synapse release 1.81.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 3b38d8370c..1386dd859f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
[tool.poetry]
name = "matrix-synapse"
-version = "1.81.0rc1"
+version = "1.81.0rc2"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.0"
diff --git a/synapse/storage/databases/main/pusher.py b/synapse/storage/databases/main/pusher.py
index aeb6034f46..87e28e22d3 100644
--- a/synapse/storage/databases/main/pusher.py
+++ b/synapse/storage/databases/main/pusher.py
@@ -562,7 +562,7 @@ class PusherBackgroundUpdatesStore(SQLBaseStore):
)
self.db_pool.updates._background_update_progress_txn(
- txn, "set_device_id_for_pushers", {"pusher_id": rows[-1]["id"]}
+ txn, "set_device_id_for_pushers", {"pusher_id": rows[-1]["pusher_id"]}
)
return len(rows)
|
