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

Update release checklist #347

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Update release checklist #347

merged 3 commits into from
Dec 18, 2024

Conversation

jbreue16
Copy link
Contributor

Updates according to our experience with the last release #345

@jbreue16 jbreue16 self-assigned this Dec 12, 2024
@jbreue16 jbreue16 force-pushed the fix/release_checklist branch from a284126 to 6c112e8 Compare December 12, 2024 16:45
@jbreue16 jbreue16 requested a review from schmoelder December 12, 2024 16:46
@@ -10,7 +10,7 @@ CADET-Core release
CADET-Core releases follow the *semantic versioning system*, which is documented [here](https://semver.org/).

**CADET-Core is released following the so-called *GitLab flow*:**
In GitLab flow, feature and hotfix branches contain work for new features and bug fixes which will be merged back into the master branch immediately when they’re finished, reviewed, and approved. The master branch is ready to be deployed, but not necessarily the source of truth for a new release: Each release has an associated release branch that is based off the master branch. Changes that are intended to be released are cherry-picked from master into the release branch. The release is made on the release branch. If desired, some release branches can be kept and maintained, which is currently not planned for the CADET-Core project.
In GitLab flow, feature and hotfix branches contain work for new features and bug fixes which will be merged back into the master branch immediately when they’re finished, reviewed, and approved. The master branch is ready to be deployed, but not necessarily the source of truth for a new release: Each release has an associated release branch that is based off the master branch. Changes that are intended to be released are cherry-picked from master onto the release branch. The release is made on the release branch. Some release branches can be kept and maintained, e.g. branch `v5.0.X` to support the last major release.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

last major release

Wouldn't v5.0.X be there to maintain the latest minor release?

Side note: using individual lines for each sentence would make reviews a bit more conveninent

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v5.2.X would support a minor release; v5.0.X supports the major release, right?
I know, usually I would make a single line for each sentence, but there was a reason against linebreaks, maybe the import from the rst file.

@jbreue16 jbreue16 merged commit 5333e26 into master Dec 18, 2024
4 checks passed
@jbreue16 jbreue16 deleted the fix/release_checklist branch December 18, 2024 16:43
@github-actions github-actions bot locked and limited conversation to collaborators Dec 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants