We're making use of semantic versioning. We use semantic versioning for two things:
- GitHub Milestones
- reNgine-ng releases
Speaking of milestones: it could be that we have a bug-fix release (e.g. 2.0.7), but a contributor submits a PR that adds a new feature. What do we do? Merge after we released 2.0.7? Change the name of the milestone to for example 2.1.0? Or another approach?
In that case, we should closely review the PR and 'compare' it with what semantic versioning has to say about the submitted feature. If the changes are significant enough, we're renaming the milestone to (for example) 2.1.0.
- Make sure the Milestone is completed and if not, check what needs to be done to complete it.
- Make sure all merged PRs regarding the application follow the Conventional Commit Messages style. This makes sure that when generating a changelog, the changes look consistent, which in turn improves readability.
- Make sure all merged PRs have the correct labels assigned, as the changelog is generated based on labels.
- Create a release preparation PR that bumps the version numbers
When all the above has been checked, you can push a tag to master
to trigger the GitHub Action that creates a release:
- Create the tag:
git tag -s v2.0.7 -am '2.0.7'
- Push the tag:
git push origin v2.0.7
Change the version number to whatever version we're releasing.
If we publish a faulty release, for example containing a critical bug, this is how we should deal with it:
We issue a hotfix and keep the faulty release but we'll add warnings to the faulty release in the changelog.