Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update types.pl to Mastodon v3.5.5(ish) #7

Closed
ionathanch opened this issue Nov 16, 2022 · 2 comments
Closed

Update types.pl to Mastodon v3.5.5(ish) #7

ionathanch opened this issue Nov 16, 2022 · 2 comments
Assignees

Comments

@ionathanch
Copy link
Collaborator

ionathanch commented Nov 16, 2022

Mastodon v4 introduces a bunch of stuff we may not want. I'm opening an issue for bumping types.pl up to v3.5.5, which according to the tag https://github.com/mastodon/mastodon/commits/v3.5.5 is just v3.5.3 with backports for the security vulnerability fixes. Unfortunately, glitch-soc doesn't have a separate branch for v3.5.5, so here's the plan:

  1. Create a new branch from types.pl and merge up to 434b08e from glitch-soc, which is where v3.5.3 was merged from mastodon (looking at the commit history here: https://github.com/glitch-soc/mastodon/commits/main?after=23ea0e75080e427e5ec6be08f7fa75fc8508cd94+1014&branch=main&qualified_name=refs%2Fheads%2Fmain)

  2. Cherry-pick the remaining commits from v3.5.5, as well as their glitch versions (in reverse order below):

    I don't think the last three are related to the security fix but I guess the bugfixes were significant enough to be backported to v3.5.5

  3. Push and have GitHub Actions do its thing

  4. Update server

    1. bundle install
    2. RAILS_ENV=production bundle exec rails assets:precompile
    3. systemctl reload mastodon-web
    4. systemctl restart mastodon-sidekiq
@ionathanch
Copy link
Collaborator Author

lmao I didn't realize we're already past v3.5.3. okay it's just cherry-picking and then testing then cool

@ionathanch
Copy link
Collaborator Author

done as of c73e908. yeehaw

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant