146
edits
Upgrade Mastodon: Difference between revisions
updating note about the issues encountered and how they were handled
(Steps to be followed for merging glitch + upstream stable release + instance's stable features) |
(updating note about the issues encountered and how they were handled) |
||
| Line 107: | Line 107: | ||
|Date Sent=23-10-01 07:44:40 | |Date Sent=23-10-01 07:44:40 | ||
|Channel=techwg-ops | |Channel=techwg-ops | ||
|Text=[[Tech WG/Ops Diary#23-10-01]] I am ready to deploy v4.2 but I encountered a few issues while following the process mentioned in [[Upgrade_Mastodon]]. I' | |Text=[[Tech WG/Ops Diary#23-10-01]] I am ready to deploy v4.2 but I encountered a few issues while following the process mentioned in [[Upgrade_Mastodon]]. The glitch-soc-main branch had commits from merge-upstream even after syncing the the branch. So I created a new branch called glitch-clean-sync from glitch-soc's main branch and added protections to this branch. This let's us keep this branch clean and not merge any custom features to this branch. We'd only use the sync feature. I also tried to follow the rest of the process but it seemed a bit complicated/unclear. I've tried to simplify it in a separate section above for glitch+4.2+our instance's features. I've also created a clean and stable dev-stable branch for custom features that we add. I've added branch protections here as well and PRs will require reviews on this branch. | ||
|Link=https://discord.com/channels/1049136631065628772/1052452072806686751/1157946171432632383 | |Link=https://discord.com/channels/1049136631065628772/1052452072806686751/1157946171432632383 | ||
}} | }} | ||