search

GatherPress / gatherpress

Powering our community's event management needs.
https://wordpress.org/plugins/gatherpress/
GNU General Public License v2.0
94 stars 30 forks source link

Default and protected branches #506

Open jeffpaul opened 9 months ago

jeffpaul commented 9 months ago

I see that there are [main](https://github.com/GatherPress/gatherpress/tree/main) and [develop](https://github.com/GatherPress/gatherpress/tree/develop) branches but only main is protected. I had expected that main might be the stable, released version of the plugin with develop being the active working branch. If that's the intent, then we might want to update the default branch to be develop and add in branch protections accordingly to ensure there are required reviews and passing actions before a PR can be merged to develop and then likely update the branch protections on the main branch to ensure only certain people can merge there (e.g. during plugin releases where merging from develop to main).

mauteri commented 3 weeks ago

@jeffpaul @carstingaxion now that the project is picking up steam I am implementing a gitflow process for development and release. Releases will be alpha, beta, release candidate (rc), and final. Instead of main, all PRs will be merged into the new develop branch. main is now readonly and represents the latest release be it alpha, beta, rc, or final. Release examples: 0.32.0-alpha.1, 0.32.0-beta.2, 0.32.0-rc.1, etc.

I know we can push development versions to WP repo. I think it would be pretty nice to do that, but I'm not sure the flow with the GH action that automatically pushes version from GH to WP repo and making sure it's seen as alpha/beta/rc vs final. @jeffpaul if you have guidance there that'd be greatly appreciated. Thx!

carstingaxion commented 3 weeks ago

When I understood this ticket correct, this is not possible yet: https://github.com/10up/action-wordpress-plugin-deploy/issues/103

jeffpaul commented 3 days ago

I know we can push development versions to WP repo. I think it would be pretty nice to do that, but I'm not sure the flow with the GH action that automatically pushes version from GH to WP repo and making sure it's seen as alpha/beta/rc vs final. @jeffpaul if you have guidance there that'd be greatly appreciated. Thx!

I see your appeal for that, but it's very much edge case. If someone were to work on a PR for it, then I'd be happy to have someone on the team get it through review but it's just not immediately going to be a priority for us.