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

Reorganize branches and development workflow #874

Closed
bagofarms opened this issue Dec 19, 2022 · 0 comments · Fixed by #875
Closed

Reorganize branches and development workflow #874

bagofarms opened this issue Dec 19, 2022 · 0 comments · Fixed by #875

Comments

@bagofarms
Copy link
Member

We're changing up the structure of the project to bring it in line with more popular repositories like Canvas, PHP, and Django. As a result, documentation and CI/CD scripts will need to change. Here is the new structure:
main will be the default branch and represent the latest version, somewhat like a "nightly".
Each release will be in the form stable/major.minor.x.
Issues are handled through branches of the format issue/###-short-description, and are merged into main.
Hotfixes for previous releases will be of the format hotfix/short-description, and will be merged into the appropriate stable branch. That stable branch would then get merged into main and all subsequent stable branches that are affected by the vulnerability.
New docker images will be built for main and all stable branches whenever there are updates.

Thanks to @Thetwam and @jonespm for working with me to come up with this structure.

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

Successfully merging a pull request may close this issue.

1 participant