search

Swiddis / word-debt-bot

A Discord bot for running a little reading game.
MIT License
2 stars 2 forks source link

Move dev to main and main to release branch #28

Closed Swiddis closed 6 months ago

Swiddis commented 6 months ago

Just as a matter of cleaner branch management, I feel like it'd be nice to swap the role of main to be dev, since dev is where most of the active work is for contribution. In its place we can replace main with a release branch, or something similar. Originally the intent was to use Git Flow but on similar projects I also see main being used as the dev branch.

It might also be a good time to look at our release strategy and see if we don't want to release features more frequently. I intend to have the bot version be semver (i.e. new commands increment the minor version), but since I don't anticipate breaking API changes for a while I'm imagining the minor version would increment a lot if we released every feature as it was finished. That's why I started bundling issues under milestones. It might be better to just have the large number of versions and get things delivered faster, though -- Firefox is on major version 115.

Swiddis commented 6 months ago

Switched away from squash merges, that should start making forward/backporting easier. Will keep following git flow. Still thinking of maybe trying to make main the dev branch.

Swiddis commented 6 months ago

Swapped the default branch to dev. Now the cache action should use that cache and not recreate caches for each feature, and things feel okay since now main isn't shown by default when the repo opens. I also added branch protections to both branches.