neuromatch

Upgrade Mastodon: Difference between revisions

Upgrade Mastodon (view source)

Revision as of 22:56, 19 September 2023

195 bytes removed ,  22:56, 19 September 2023
no edit summary
No edit summary
No edit summary
Line 7: Line 7:
all branches refer to those in [https://github.com/NeuromatchAcademy/mastodon NeuromatchAcademy/mastodon] unless specified otherwise.
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 Create a pull request] to merge changes from <code>glitch-soc/mastodon:main</code> to <code>NeuromatchAcademy/mastodon:glitch-soc-main</code>
* Sync the <code>[https://github.com/NeuromatchAcademy/mastodon/tree/glitch-soc-main glitch-soc-main]</code> branch to <code>glitch-soc/mastodon:main</code>: Open the branch page and click "sync fork"
* Resolve conflicts, ensuring that [[Mastodon/Hacking|changes we have made locally]] are preserved when possible.
** 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 <code>main</code> branch that ''doesn't'' reflect our local changes, we will handle that in the next step.
[[File:Upgrading-sync-branch.png|class=img-responsive]]
* [https://github.com/NeuromatchAcademy/mastodon/compare/merge-upstream...NeuromatchAcademy:mastodon:glitch-soc-main Create a pull request] from <code>glitch-soc-main</code> to <code>merge-upstream</code>
** Resolve conflicts, ensuring that [[Mastodon/Hacking|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
** 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 <code>main</code> have been merged into <code>glitch-soc-main</code>
** Don't try and fix failing tests here - that would edit the <code>glitch-soc-main</code> branch, which will then be overwritten on the next fork fix.
*


== Discord ==
== Discord ==
Line 31: Line 35:
https://discord.com/channels/1049136631065628772/1049184335514828860/1109355378178789396
https://discord.com/channels/1049136631065628772/1049184335514828860/1109355378178789396
|Link=https://discord.com/channels/1049136631065628772/1052452072806686751/1109356466130931765
|Link=https://discord.com/channels/1049136631065628772/1052452072806686751/1109356466130931765
}}{{Message
|Author=sneakers.the.rat
|Avatar=https://cdn.discordapp.com/avatars/305044217393053697/2970b22bd769d0cd0ee1de79be500e85.png?size=1024
|Date Sent=23-09-20 02:55:44
|Channel=techwg-ops
|Text=[[Tech WG/Ops Diary#23-09-19]] - Upgrading to 4.2-RC2 while trying to write the [[Upgrade Mastodon]] docs. currently doing the merge from upstream and noticing db migrations for exclusive lists failing, but not fixing now because that would put the fixes in the `glitch-soc-main` branch which is a local mirror of upstream which gets force pushed. Seems like that should happen in the `merge-upstream` branch after upstream is merged
|Link=https://discord.com/channels/1049136631065628772/1052452072806686751/1153887188946268211
}}
}}
Retrieved from "https://wiki.neuromatch.social/Special:MobileDiff/876"