Upgrade Mastodon: Difference between revisions

From neuromatch
(→‎Discord: new section)
 
No edit summary
Line 1: Line 1:
Up to: [[Part Of::Tech WG]]
== Stages ==
=== Merging ===
all branches refer to those in [https://github.com/NeuromatchAcademy/mastodon NeuromatchAcademy/mastodon] unless specified otherwise.
https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main
* Ensure any changes in <code>main</code> have been merged into <code>glitch-soc-main</code>
* [https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main Create a pull request] to merge changes from <code>glitch-soc/mastodon:main</code> to <code>NeuromatchAcademy/mastodon:glitch-soc-main</code>:
== Discord ==
== Discord ==



Revision as of 20:53, 19 September 2023

Up to: Tech WG

Stages

Merging

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

https://github.com/NeuromatchAcademy/mastodon/compare/glitch-soc-main...glitch-soc:mastodon:main

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