Upgrade Mastodon

From neuromatch
Revision as of 21:04, 19 September 2023 by Jonny (talk | contribs)

Up to: Tech WG

Stages

Merging

all branches refer to those in NeuromatchAcademy/mastodon unless specified otherwise.

  • Create a pull request to merge changes from glitch-soc/mastodon:main to NeuromatchAcademy/mastodon:glitch-soc-main
  • 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
  • Ensure any changes in main have been merged into glitch-soc-main

Discord

sneakers-the-rat#techwg-ops23-05-20 05:46:32

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