Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 4358f51

Browse files
committed
Merge branch 'release-v1.38' into develop
2 parents 47e28b4 + 26196df commit 4358f51

36 files changed

+87
-64
lines changed

.github/workflows/docs.yaml

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- develop
88
# For documentation specific to a release
99
- 'release-v*'
10+
# stable docs
11+
- master
1012

1113
workflow_dispatch:
1214

@@ -30,40 +32,35 @@ jobs:
3032
mdbook build
3133
cp book/welcome_and_overview.html book/index.html
3234
33-
# Deploy to the latest documentation directories
34-
- name: Deploy latest documentation
35-
uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305 # v3.8.0
36-
with:
37-
github_token: ${{ secrets.GITHUB_TOKEN }}
38-
keep_files: true
39-
publish_dir: ./book
40-
destination_dir: ./develop
41-
42-
- name: Get the current Synapse version
35+
# Figure out the target directory.
36+
#
37+
# The target directory depends on the name of the branch
38+
#
39+
- name: Get the target directory name
4340
id: vars
44-
# The $GITHUB_REF value for a branch looks like `refs/heads/release-v1.2`. We do some
45-
# shell magic to remove the "refs/heads/release-v" bit from this, to end up with "1.2",
46-
# our major/minor version number, and set this to a var called `branch-version`.
47-
#
48-
# We then use some python to get Synapse's full version string, which may look
49-
# like "1.2.3rc4". We set this to a var called `synapse-version`. We use this
50-
# to determine if this release is still an RC, and if so block deployment.
5141
run: |
52-
echo ::set-output name=branch-version::${GITHUB_REF#refs/heads/release-v}
53-
echo ::set-output name=synapse-version::`python3 -c 'import synapse; print(synapse.__version__)'`
42+
# first strip the 'refs/heads/' prefix with some shell foo
43+
branch="${GITHUB_REF#refs/heads/}"
5444
55-
# Deploy to the version-specific directory
56-
- name: Deploy release-specific documentation
57-
# We only carry out this step if we're running on a release branch,
58-
# and the current Synapse version does not have "rc" in the name.
59-
#
60-
# The result is that only full releases are deployed, but can be
61-
# updated if the release branch gets retroactive fixes.
62-
if: ${{ startsWith( github.ref, 'refs/heads/release-v' ) && !contains( steps.vars.outputs.synapse-version, 'rc') }}
63-
uses: peaceiris/actions-gh-pages@v3
45+
case $branch in
46+
release-*)
47+
# strip 'release-' from the name for release branches.
48+
branch="${branch#release-}"
49+
;;
50+
master)
51+
# deploy to "latest" for the master branch.
52+
branch="latest"
53+
;;
54+
esac
55+
56+
# finally, set the 'branch-version' var.
57+
echo "::set-output name=branch-version::$branch"
58+
59+
# Deploy to the target directory.
60+
- name: Deploy to gh pages
61+
uses: peaceiris/actions-gh-pages@068dc23d9710f1ba62e86896f84735d869951305 # v3.8.0
6462
with:
6563
github_token: ${{ secrets.GITHUB_TOKEN }}
6664
keep_files: true
6765
publish_dir: ./book
68-
# The resulting documentation will end up in a directory named `vX.Y`.
69-
destination_dir: ./v${{ steps.vars.outputs.branch-version }}
66+
destination_dir: ./${{ steps.vars.outputs.branch-version }}

CHANGES.md

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,54 @@
1-
Synapse 1.38.0 (**UNRELEASED**)
2-
===============================
1+
Synapse 1.38.0rc1 (2021-07-06)
2+
==============================
3+
34
This release includes a database schema update which could result in elevated disk usage. See the [upgrade notes](https://matrix-org.github.io/synapse/develop/upgrade.md#upgrading-to-v1380) for more information.
45

6+
Features
7+
--------
8+
9+
- Implement refresh tokens as specified by [MSC2918](https://github.com/matrix-org/matrix-doc/pull/2918). ([\#9450](https://github.com/matrix-org/synapse/issues/9450))
10+
- Add support for evicting cache entries based on last access time. ([\#10205](https://github.com/matrix-org/synapse/issues/10205))
11+
- Omit empty fields from the `/sync` response. Contributed by @deepbluev7. ([\#10214](https://github.com/matrix-org/synapse/issues/10214))
12+
- Improve validation on federation `send_{join,leave,knock}` endpoints. ([\#10225](https://github.com/matrix-org/synapse/issues/10225), [\#10243](https://github.com/matrix-org/synapse/issues/10243))
13+
- Add SSO `external_ids` to the Query User Account admin API. ([\#10261](https://github.com/matrix-org/synapse/issues/10261))
14+
- Mark events received over federation which fail a spam check as "soft-failed". ([\#10263](https://github.com/matrix-org/synapse/issues/10263))
15+
- Add metrics for new inbound federation staging area. ([\#10284](https://github.com/matrix-org/synapse/issues/10284))
16+
- Add script to print information about recently registered users. ([\#10290](https://github.com/matrix-org/synapse/issues/10290))
17+
18+
19+
Bugfixes
20+
--------
21+
22+
- Fix a long-standing bug which meant that invite rejections and knocks were not sent out over federation in a timely manner. ([\#10223](https://github.com/matrix-org/synapse/issues/10223))
23+
- Fix a bug introduced in v1.26.0 where only users who have set profile information could be deactivated with erasure enabled. ([\#10252](https://github.com/matrix-org/synapse/issues/10252))
24+
- Fix a long-standing bug where Synapse would return errors after 2<sup>31</sup> events were handled by the server. ([\#10264](https://github.com/matrix-org/synapse/issues/10264), [\#10267](https://github.com/matrix-org/synapse/issues/10267), [\#10282](https://github.com/matrix-org/synapse/issues/10282), [\#10286](https://github.com/matrix-org/synapse/issues/10286), [\#10291](https://github.com/matrix-org/synapse/issues/10291), [\#10314](https://github.com/matrix-org/synapse/issues/10314))
25+
- Fix the prometheus `synapse_federation_server_pdu_process_time` metric. Broke in v1.37.1. ([\#10279](https://github.com/matrix-org/synapse/issues/10279))
26+
- Ensure that inbound events from federation that were being processed when Synapse was restarted get promptly processed on start up. ([\#10303](https://github.com/matrix-org/synapse/issues/10303))
27+
28+
29+
Improved Documentation
30+
----------------------
31+
32+
- Move the upgrade notes to [docs/upgrade.md](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md) and convert them to markdown. ([\#10166](https://github.com/matrix-org/synapse/issues/10166))
33+
- Choose Welcome & Overview as the default page for synapse documentation website. ([\#10242](https://github.com/matrix-org/synapse/issues/10242))
34+
- Adjust the URL in the README.rst file to point to irc.libera.chat. ([\#10258](https://github.com/matrix-org/synapse/issues/10258))
35+
- Fix homeserver config option name in presence router documentation. ([\#10288](https://github.com/matrix-org/synapse/issues/10288))
36+
- Fix link pointing at the wrong section in the modules documentation page. ([\#10302](https://github.com/matrix-org/synapse/issues/10302))
37+
38+
39+
Internal Changes
40+
----------------
41+
42+
- Drop `Origin` and `Accept` from the value of the `Access-Control-Allow-Headers` response header. ([\#10114](https://github.com/matrix-org/synapse/issues/10114))
43+
- Add type hints to the federation servlets. ([\#10213](https://github.com/matrix-org/synapse/issues/10213))
44+
- Improve the reliability of auto-joining remote rooms. ([\#10237](https://github.com/matrix-org/synapse/issues/10237))
45+
- Update the release script to use the semver terminology and determine the release branch based on the next version. ([\#10239](https://github.com/matrix-org/synapse/issues/10239))
46+
- Fix type hints for computing auth events. ([\#10253](https://github.com/matrix-org/synapse/issues/10253))
47+
- Improve the performance of the spaces summary endpoint by only recursing into spaces (and not rooms in general). ([\#10256](https://github.com/matrix-org/synapse/issues/10256))
48+
- Move event authentication methods from `Auth` to `EventAuthHandler`. ([\#10268](https://github.com/matrix-org/synapse/issues/10268))
49+
- Re-enable a SyTest after it has been fixed. ([\#10292](https://github.com/matrix-org/synapse/issues/10292))
50+
51+
552
Synapse 1.37.1 (2021-06-30)
653
===========================
754

changelog.d/10114.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10166.doc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10205.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10213.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10214.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10223.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10225.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/10237.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)