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

Add branches to latest major versions #92

Closed
docwhat opened this issue Feb 10, 2023 · 2 comments
Closed

Add branches to latest major versions #92

docwhat opened this issue Feb 10, 2023 · 2 comments
Assignees

Comments

@docwhat
Copy link

docwhat commented Feb 10, 2023

Please consider adding a branch for each major version to allow easy linking to the correct documents and template. e.g., stable-1, stable-2, stable-3.

This would allow linking to (for example) the latest 2.x template without pulling in 3.x features until we are ready for them.

@koppor
Copy link
Member

koppor commented Apr 26, 2023

I read into https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow and created the following branches (see https://github.com/adr/madr/branches for the complete list)

  • main always having the latest release
  • develop for development - homepage generated using netlify - hosted at https://develop--madr-develop.netlify.app/
  • gh-pages for the homepage - being the stable homepage.
  • releases/v1, releases/v2, releases/v3 tracking releases of (past) major versions. Will create develop/v1 and others as needed.

I looked at https://github.com/actions/setup-java for inspiration. They also seem to have "moving tags" for their major versions. I opted against it and keep the branches. There will be develop/v1 in case there is a fix for the old versions.

I think, this should solve the issue. If not, feel free to reopen.

@koppor
Copy link
Member

koppor commented Sep 20, 2023

I removed branch main, because it causes confusion. All development should be in develop. That name should make clear that it's not the release version.

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

2 participants