1,035
edits
No edit summary |
No edit summary |
||
Line 21: | Line 21: | ||
** We do this additional step before merging to main because we might have collected some hacks or additional code in <code>dev</code> 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 <code>dev</code> from some other branches before deploying (and generally we want to play the upstream over dev) | ||
* Merge <code>dev</code> to <code>main</code> | * Merge <code>dev</code> to <code>main</code> | ||
=== Deploying === | |||
* Make a [[Backups|backup]] on the linode dashboard | |||
* Check for any release-specific instructions and follow those! If you are doing an upgrade through several versions, make sure you follow those too! | |||
** Base masto: https://github.com/mastodon/mastodon/releases | |||
** Glitch docs (mostly just the same as base masto): https://glitch-soc.github.io/docs/ | |||
== Discord == | == Discord == |