for_developers:releaseprocess
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| for_developers:releaseprocess [2023/12/16 10:50] – [2. Creation of a new release branch] ursgraf | for_developers:releaseprocess [2026/04/22 10:54] (current) – [8. Generate the API documentation with Doxygen] ursgraf | ||
|---|---|---|---|
| Line 47: | Line 47: | ||
| </ | </ | ||
| - | Probably you already have a release branch, e.g. do want to release v1.0.3 and still have your branch for v.1.0.2. If so switch to branch v1.0 and merge your master branch (or whatever work you want to be included) into the release branch. | + | Probably you already have a release branch, e.g. do want to release v1.0.3 and still have your branch for v.1.0.2. If so, switch to branch v1.0 and **merge your master branch** (or whatever work you want to be included) into the release branch. |
| + | < | ||
| + | git checkout v1.0 | ||
| + | git merge master | ||
| + | </ | ||
| ==== 3. Creation of a new Jenkins item for the new release branch | ==== 3. Creation of a new Jenkins item for the new release branch | ||
| Line 123: | Line 128: | ||
| The change is committed and pushed. | The change is committed and pushed. | ||
| + | < | ||
| + | git add *CHANGELOG.md* | ||
| + | git commit -m "Add unreleased section" | ||
| + | git push | ||
| + | </ | ||
| Line 130: | Line 140: | ||
| < | < | ||
| - | ... eeros-framework/ | + | ... eeros-framework/ |
| </ | </ | ||
for_developers/releaseprocess.1702720249.txt.gz · Last modified: by ursgraf