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.

Sign up for GitHub

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

Jump to bottom

Create release branch for Popochiu 1.x and adopt a release-based branching model #14

Closed
3 tasks done
stickgrinder opened this issue Dec 4, 2022 · 1 comment
Closed
3 tasks done

Create release branch for Popochiu 1.x and adopt a release-based branching model #14

stickgrinder opened this issue Dec 4, 2022 · 1 comment
Labels
improvement New feature or request
Milestone
v2.0 - Stable

Comments

@stickgrinder
Copy link
Collaborator

stickgrinder commented Dec 4, 2022 •
edited
Loading

Related to #12 and the Popochiu 2.0 milestone in general, we decided 1.x will go on maintenance. New releases may contain a bunch of backported features but main development will happen on 2.0.

The following should happen on popochiu-dev, which at the moment has no tags (this is strictly related to #13 and is another undesirable effect of the separation of development and release branches, in my opinion):

  • Branch from main (should be develop, in case Smoothen release workflow #13 is done) to a maintenance/1.x branch
  • Tag 1.8.4 release on that branch so that subsequent released will be tagged on the maintenance branch
  • (in case Smoothen release workflow #13 is done) Make sure the release automation keeps working on the maintenance branch without creating issues

The development on the main/develop branch will always be on the more recent version (2.0 at the time of writing)
@stickgrinder stickgrinder added the improvement New feature or request label Dec 4, 2022
stickgrinder added a commit that referenced this issue Feb 2, 2023
@stickgrinder
refs #14: popochiu-dev repo content has been merged in release repo: …
fd0ef80 
…v1.9.0 ready to release, automations in place and checked.
mapedorr pushed a commit that referenced this issue Feb 2, 2023
@stickgrinder
refs #14: popochiu-dev repo content has been merged in release repo: …
3bfc66d 
…v1.9.0 ready to release, automations in place and checked. (#20)
@stickgrinder
Copy link
Collaborator Author

This has been done today!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
improvement New feature or request
Projects
None yet
Milestone
v2.0 - Stable
Development

No branches or pull requests
1 participant
@stickgrinder