Upgrade Mastodon
Up to: Tech WG
Stages
Merging
all branches refer to those in NeuromatchAcademy/mastodon unless specified otherwise.
- Sync the
glitch-soc-main
branch toglitch-soc/mastodon:main
: Open the branch page and click "sync fork"- If there are any local changes that make a conflict, they can be discarded - this branch is supposed to just be a local copy of the upstream
main
branch that doesn't reflect our local changes, we will handle that in the next step.
- If there are any local changes that make a conflict, they can be discarded - this branch is supposed to just be a local copy of the upstream
- Create a pull request from
glitch-soc-main
tomerge-upstream
- Resolve conflicts, ensuring that changes we have made locally are preserved when possible.
- If it is not possible to preserve a hack, eg. because the relevant feature has been deprecated, update the corresponding feature page and include that in the pull request description
- Don't try and fix failing tests here - that would edit the
glitch-soc-main
branch, which will then be overwritten on the next fork fix.
- Merge
dev
intomerge-upstream
if necessary- It seems like this is the way glitch-soc does it, merge all from upstream masto into a branch from dev, then merge dev into the branch to ensure all glitch modifications go on top of the upstream? not exactly sure -jonny
- Fix any failing tests in the
merge-upstream
branch- Ruby Tests, One and Two step db migrations must pass, but linting failing is fine and normal
- If any changes were made after merging
dev
, Create a pull request frommerge-upstream
todev
. Otherwise just mergemerge-upstream
todev
- We do this additional step before merging to main because we might have collected some hacks or additional code in
dev
from some other branches before deploying (and generally we want to play the upstream over dev)
- We do this additional step before merging to main because we might have collected some hacks or additional code in
- Merge
dev
tomain
Discord
Tech WG/Ops Diary#23-05-19: We are attempting to Upgrade Mastodon to 4.1.2 and also merge in Exclusive Lists, wish us luck.
We begin with what is probably the worst way to do it based on the conversation in <#1049184335514828860> , specifically:
- main -> dev,
- upstream -> dev,
- dev -> pr,
- pr -> dev,
- dev -> main
https://discord.com/channels/1049136631065628772/1049184335514828860/1109355378178789396