@@ -17,28 +17,10 @@ under an AGPL license.
1717
1818.. contents ::
1919
20- Rebasing this fork
21- ==================
22-
23- TL;DR: There's a `./make_release.sh ` script which does the things below.
24- It currently doesn't handle rebase conflicts gracefully yet.
25-
26- This is the Famedly Fork of synapse. It applies a few patches, which need to
27- be rebased upon every synapse release. To do this, the following workflow is used:
28-
29- - Checkout `master ` of the fork, then `fetch -a ` from the upstream
30-
31- - Rebase all commits (from our master) upon `upstream/master `: `git rebase upstream/master `
32-
33- - Switch to the `release-vM.m.f ` branch (comes from upstream), and merge the
34- master into it using `git merge --ff-only master `. Then push the `release-* `
35- branch to the famedly-remote.
20+ Release process for this fork
21+ =============================
3622
37- - The CI is configured in a way that creating a tag on the `release- `-branch
38- will create a new release. The tag needs to have the form `v$originalSynapseVersion_$count `,
39- so `v1.29.0_1 `, `v1.29.0_2 ` and so on - as content, we suggest `v$synapseVersion - $date `.
40- If we change our patchset after we already released a version of synapse, we force-push to
41- the `release- ` branch and increase the counter and push a new tag.
23+ There is more information for Famedly employees in `Notion <https://www.notion.so/famedly/Synapse-Release-Process-2ae4c3a9792080428920cff83fb8bfaf >`__
4224
4325
4426🛠️ Installation and configuration
0 commit comments