Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 1 | Repository: voltha-lib-go |
| 2 | ========================= |
| 3 | |
| 4 | - Tag and branch repositories (order is important) |
Joey Armstrong | e9edbda | 2024-01-03 05:00:31 -0500 | [diff] [blame] | 5 | - Update .gitreview, set defaultbranch=voltha-2.12 for commits |
| 6 | - Update VERSION file to prevent future conflicts: {major}.{minor+1}.0 |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 7 | |
Joey Armstrong | 68539dc | 2024-02-01 18:24:09 -0500 | [diff] [blame] | 8 | ## TODO: Replace with bttb.sh script usage |
| 9 | - git checkout -b voltha-2.12 tags/2.12.0 |
| 10 | - Update .gitreview |
| 11 | - set defaultbranch=voltha-2.12 for commits |
| 12 | |
| 13 | - master branch |
| 14 | |
| 15 | - Increment version file to prevent collision with release branch. |
| 16 | - Append a ``*-dev`` suffix to the version string |
| 17 | - {max}.{1+min}.0-dev |
| 18 | |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 19 | |
| 20 | Release branching and tagging |
| 21 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 22 | |
| 23 | Releasing repository voltha-lib-go requires tag-then-release branching, |
Joey Armstrong | 68539dc | 2024-02-01 18:24:09 -0500 | [diff] [blame] | 24 | first create a versioned tag 2.12.0 then create branch voltha-2.12 |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 25 | from the release tag. |
| 26 | |
| 27 | Repository tag names differ based on repository, golang repositories |
| 28 | use tags with the prefix vee v1.2.3, v2.45.0 |
| 29 | |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 30 | |
| 31 | .. code-block:: shell-session |
Joey Armstrong | 68539dc | 2024-02-01 18:24:09 -0500 | [diff] [blame] | 32 | :caption: AUTOMATED: Release script bttb.sh |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 33 | |
Joey Armstrong | 68539dc | 2024-02-01 18:24:09 -0500 | [diff] [blame] | 34 | ## ----------------------------------------------------------- |
| 35 | ## Use the bttb.sh (branch-tag_OR_tag-branch) script to branch/tag. |
| 36 | ## Script is aware of how to tag/branch VOLTHA repositories by name. |
| 37 | ## ----------------------------------------------------------- |
| 38 | % git clone ssh://gerrit.opencord.org:29418/voltha-release.git |
| 39 | % cd voltha-release |
| 40 | % ./bttb.sh --sandbox sandbox --repo voltha-lib-go --version 2.12 |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 41 | |
| 42 | See Also |
| 43 | -------- |
| 44 | https://docs.voltha.org/master/release_notes/release_process.html |
| 45 | |
| 46 | |
| 47 | .gitreview |
| 48 | ---------- |
| 49 | |
| 50 | .. code-block:: shell-session |
| 51 | :caption: Create a release branch attached to the release tag |
| 52 | |
| 53 | grep -v 'defaultbranch' .gitreview > .gitreview.tmp |
Joey Armstrong | 68539dc | 2024-02-01 18:24:09 -0500 | [diff] [blame] | 54 | echo "defaultbranch=voltha-2.12" >> .gitreview.tmp |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 55 | mv -f .gitreview.tmp .gitreview |
| 56 | |
| 57 | |
| 58 | VERSION File |
| 59 | ^^^^^^^^^^^^ |
| 60 | |
| 61 | Minor release version number must be incremented to prevent future conflicts |
| 62 | with the patch branch. |
| 63 | |
| 64 | - branch=main VERSION=1.2.3 |
| 65 | |
| 66 | - Update VERSION to contain 1.2.4 or 1.3.0 |
| 67 | - commit and merge |
| 68 | |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 69 | - Update VERSION file/patch branch to contain 1.2.3.1 |
Joey Armstrong | 898d33d | 2023-08-09 09:49:57 -0400 | [diff] [blame] | 70 | - commit and merge |
| 71 | |
Joey Armstrong | 3df7834 | 2023-08-15 10:16:43 -0400 | [diff] [blame] | 72 | |
| 73 | Patch creation on release branch |
| 74 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 75 | |
| 76 | Note: Devs should create a dev branch for merging rather than manipulating |
| 77 | the release branch directly as these instructions will. |
| 78 | |
| 79 | - git checkout -b voltha-2.12 tags/v2.12.0 |
| 80 | - git pull --ff-only origin voltha-2.12 |
| 81 | - git rebase -i voltha-2.12 |
| 82 | - git diff --name-only votlha-2.12 2>&1 | less |
| 83 | - git review --reviewers foo@foo bar@bar |
| 84 | |
| 85 | Patch creation on release branch |
| 86 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
| 87 | |
| 88 | `docs.voltha.org - create the initial release <https://docs.voltha.org/master/release_notes/release_process.html#creating-the-initial-release>`_ |
| 89 | |
| 90 | - git clone ssh://gerrit.opencord.org:29418/voltha-protos.git |
| 91 | - git checkout -b dev_tux |
| 92 | - Edit VERSION file, increment and suffix a -dev modifier |
| 93 | |
| 94 | - VERSION file contains 5.4.3 |
| 95 | - Increment and commit 5.4.4-dev |