Hop on the glitch release cycle #15

New issue

Closed

opened 2025-01-30 20:41:31 +00:00 by CSDUMMI · 2 comments

CSDUMMI commented

2025-01-30 20:41:31 +00:00

(Migrated from gitlab.com)

Glitch has releases.
But Babka has been running based off glitch/main for a while now and doing monthly updates.

In order to get into the new normal release cycle for glitch, we thought it would be enough to simply wait until Mastodon +Glitch releases would advance enough until we could just merge into the newest version tag instead of the newest glitch/main.

After three months of waiting, this does not seem to be the case still.

I've tried to do the merge from the tag regardless, but this let to a variety of bugs due to divergences between glitch/main and glitch/v4.3.3 (the most recent version tag).

I think the best strategy for us right now is to manualy identify the babka-specific changes that we want to keep and to then transfer them into glitch/v4.3.3 manually and without performing a merge between babka, glitch/main and glitch/v4.3.3 - as this will lead to unintended bugs all over the place in the source code between glitch/main and v4.3.3.

Glitch has releases. But Babka has been running based off glitch/main for a while now and doing monthly updates. In order to get into the new normal release cycle for glitch, we thought it would be enough to simply wait until Mastodon +Glitch releases would advance enough until we could just merge into the newest version tag instead of the newest `glitch/main`. After three months of waiting, this does not seem to be the case still. I've tried to do the merge from the tag regardless, but this let to a variety of [bugs](https://gitlab.com/babka_net/mastodon-babka/-/commits/babka-new) due to divergences between `glitch/main` and `glitch/v4.3.3` (the most recent version tag). I think the best strategy for us right now is to manualy identify the babka-specific changes that we want to keep and to then transfer them into `glitch/v4.3.3` manually and without performing a merge between `babka`, `glitch/main` and `glitch/v4.3.3` - as this will lead to unintended bugs all over the place in the source code between `glitch/main` and `v4.3.3`.

CSDUMMI commented

2025-01-30 20:41:31 +00:00

(Migrated from gitlab.com)

assigned to @CSDUMMI

CSDUMMI (Migrated from gitlab.com) closed this issue

2025-04-28 11:07:49 +00:00

CSDUMMI commented

2025-04-28 11:07:52 +00:00

(Migrated from gitlab.com)

We are now on the Glitch release cycle.