From 1cdfbd3cd8e01d04b3875f297bc0ab27822f7ea2 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 4 Oct 2022 12:00:16 -0400 Subject: [PATCH] v1.4 patch release cleanup (#1268) * Add missing steps to patch release guidelines * Update from v1.4 patch --- changelogs/client_server/newsfragments/1261.clarification | 1 - changelogs/client_server/newsfragments/1263.clarification | 1 - layouts/partials/changelogs/v1.4.md | 3 ++- meta/releasing.md | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 changelogs/client_server/newsfragments/1261.clarification delete mode 100644 changelogs/client_server/newsfragments/1263.clarification diff --git a/changelogs/client_server/newsfragments/1261.clarification b/changelogs/client_server/newsfragments/1261.clarification deleted file mode 100644 index a973a159..00000000 --- a/changelogs/client_server/newsfragments/1261.clarification +++ /dev/null @@ -1 +0,0 @@ -Add `thread_id` to the `/receipt` endpoint, as per [MSC3771](https://github.com/matrix-org/matrix-spec-proposals/pull/3771) \ No newline at end of file diff --git a/changelogs/client_server/newsfragments/1263.clarification b/changelogs/client_server/newsfragments/1263.clarification deleted file mode 100644 index 3ccb2333..00000000 --- a/changelogs/client_server/newsfragments/1263.clarification +++ /dev/null @@ -1 +0,0 @@ -Fix various typos throughout the specification. diff --git a/layouts/partials/changelogs/v1.4.md b/layouts/partials/changelogs/v1.4.md index e383ae6e..2e741e06 100644 --- a/layouts/partials/changelogs/v1.4.md +++ b/layouts/partials/changelogs/v1.4.md @@ -36,13 +36,14 @@ Variables: - Allow `m.fully_read` markers to be set from `/receipts`, as per [MSC2285](https://github.com/matrix-org/matrix-spec-proposals/pull/2285). ([#1216](https://github.com/matrix-org/matrix-spec/issues/1216)) - Add threading via `m.thread` relations, as per [MSC3440](https://github.com/matrix-org/matrix-spec-proposals/pull/3440), [MSC3816](https://github.com/matrix-org/matrix-spec-proposals/pull/3816), [MSC3856](https://github.com/matrix-org/matrix-spec-proposals/pull/3856), and [MSC3715](https://github.com/matrix-org/matrix-spec-proposals/pull/3715). ([#1254](https://github.com/matrix-org/matrix-spec/issues/1254)) - Add per-thread notifications and read receipts, as per [MSC3771](https://github.com/matrix-org/matrix-spec-proposals/pull/3771) and [MSC3773](https://github.com/matrix-org/matrix-spec-proposals/pull/3773). ([#1255](https://github.com/matrix-org/matrix-spec/issues/1255)) +- Add `thread_id` to the `/receipt` endpoint, as per [MSC3771](https://github.com/matrix-org/matrix-spec-proposals/pull/3771). ([#1261](https://github.com/matrix-org/matrix-spec/issues/1261)) Spec Clarifications - Mention that the `/rooms/{roomId}/invite` endpoint will return a 200 response if the user is already invited to the room. ([#1084](https://github.com/matrix-org/matrix-spec/issues/1084)) -- Fix various typos throughout the specification. ([#1135](https://github.com/matrix-org/matrix-spec/issues/1135), [#1161](https://github.com/matrix-org/matrix-spec/issues/1161), [#1164](https://github.com/matrix-org/matrix-spec/issues/1164), [#1170](https://github.com/matrix-org/matrix-spec/issues/1170), [#1180](https://github.com/matrix-org/matrix-spec/issues/1180), [#1215](https://github.com/matrix-org/matrix-spec/issues/1215), [#1238](https://github.com/matrix-org/matrix-spec/issues/1238), [#1243](https://github.com/matrix-org/matrix-spec/issues/1243)) +- Fix various typos throughout the specification. ([#1135](https://github.com/matrix-org/matrix-spec/issues/1135), [#1161](https://github.com/matrix-org/matrix-spec/issues/1161), [#1164](https://github.com/matrix-org/matrix-spec/issues/1164), [#1170](https://github.com/matrix-org/matrix-spec/issues/1170), [#1180](https://github.com/matrix-org/matrix-spec/issues/1180), [#1215](https://github.com/matrix-org/matrix-spec/issues/1215), [#1238](https://github.com/matrix-org/matrix-spec/issues/1238), [#1243](https://github.com/matrix-org/matrix-spec/issues/1243), [#1263](https://github.com/matrix-org/matrix-spec/issues/1263)) - Describe return codes for account data endpoints, and clarify that per-room data does not inherit from the global data. ([#1155](https://github.com/matrix-org/matrix-spec/issues/1155)) - Clarify that policy rule globs work like ACL globs. Contributed by Nico. ([#1165](https://github.com/matrix-org/matrix-spec/issues/1165)) - Clarify the format of some structures in the End-to-end encryption module. ([#1166](https://github.com/matrix-org/matrix-spec/issues/1166)) diff --git a/meta/releasing.md b/meta/releasing.md index 64a01a95..3e01dc86 100644 --- a/meta/releasing.md +++ b/meta/releasing.md @@ -83,3 +83,5 @@ is typically best reserved for the next release cycle. 4. Wait for the GitHub Actions build to complete on the tag. 5. Update the assets on the GitHub release to those generated by the latest Actions build. 6. Deploy the release on the webserver. See internal wiki. +7. Remove the changelog entries from `main`, if the changes landed on `main`. +8. Update the github release changelog and changelog on `main`, likely by hand.