blob: a51e50cb86dc2458e88c6bdac1c8755c6948c3f2 [file] [log] [blame]
Joey Armstrong898d33d2023-08-09 09:49:57 -04001Repository: voltha-lib-go
2=========================
3
4- Tag and branch repositories (order is important)
Joey Armstronge9edbda2024-01-03 05:00:31 -05005- Update .gitreview, set defaultbranch=voltha-2.12 for commits
6- Update VERSION file to prevent future conflicts: {major}.{minor+1}.0
Joey Armstrong898d33d2023-08-09 09:49:57 -04007
Joey Armstrong68539dc2024-02-01 18:24:09 -05008## 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 Armstrong898d33d2023-08-09 09:49:57 -040019
20Release branching and tagging
21^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
22
23Releasing repository voltha-lib-go requires tag-then-release branching,
Joey Armstrong68539dc2024-02-01 18:24:09 -050024first create a versioned tag 2.12.0 then create branch voltha-2.12
Joey Armstrong898d33d2023-08-09 09:49:57 -040025from the release tag.
26
27Repository tag names differ based on repository, golang repositories
28use tags with the prefix vee v1.2.3, v2.45.0
29
Joey Armstrong898d33d2023-08-09 09:49:57 -040030
31.. code-block:: shell-session
Joey Armstrong68539dc2024-02-01 18:24:09 -050032 :caption: AUTOMATED: Release script bttb.sh
Joey Armstrong898d33d2023-08-09 09:49:57 -040033
Joey Armstrong68539dc2024-02-01 18:24:09 -050034 ## -----------------------------------------------------------
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 Armstrong898d33d2023-08-09 09:49:57 -040041
42See Also
43--------
44https://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 Armstrong68539dc2024-02-01 18:24:09 -050054 echo "defaultbranch=voltha-2.12" >> .gitreview.tmp
Joey Armstrong898d33d2023-08-09 09:49:57 -040055 mv -f .gitreview.tmp .gitreview
56
57
58VERSION File
59^^^^^^^^^^^^
60
61Minor release version number must be incremented to prevent future conflicts
62with 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 Armstrong898d33d2023-08-09 09:49:57 -040069 - Update VERSION file/patch branch to contain 1.2.3.1
Joey Armstrong898d33d2023-08-09 09:49:57 -040070 - commit and merge
71
Joey Armstrong3df78342023-08-15 10:16:43 -040072
73Patch creation on release branch
74^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
75
76Note: Devs should create a dev branch for merging rather than manipulating
77the 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
85Patch 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